From 0f60ede434adea42423fe23ab98a07dd43a0e153 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 17 Jun 2020 15:46:53 +0200
Subject: [PATCH] wip #3712 @1

---
 app/Console/Commands/ExtranetMigration.php |  14 +-
 app/Models/Company.php                     |   2 +-
 app/Models/User.php                        |   2 +-
 composer.lock                              | 230 ++++++++-------------
 {                                          |   0
 5 files changed, 102 insertions(+), 146 deletions(-)
 create mode 100644 {

diff --git a/app/Console/Commands/ExtranetMigration.php b/app/Console/Commands/ExtranetMigration.php
index 51f28b5..69574d0 100644
--- a/app/Console/Commands/ExtranetMigration.php
+++ b/app/Console/Commands/ExtranetMigration.php
@@ -67,7 +67,9 @@ class ExtranetMigration extends CubistCommand
             'tva_intra' => 'vat_number',
             'type' => 'type',
             'ws_admin' => 'admin',
-            'site' => 'website'];
+            'site' => 'website',
+            'ws_signatures' => 'e1_ws_signatures',
+            'ws_grade' => 'e1_ws_grade'];
 
         Company::query()->truncate();
         foreach (DB::table('extranet_clean.entreprises')->get() as $e) {
@@ -90,6 +92,9 @@ class ExtranetMigration extends CubistCommand
     protected function importUsers()
     {
         set_time_limit(0);
+
+        $extranetv1 = ['settings', 'ws_settings', 'ws_rights', 'ws_domains', 'login', 'mobile', 'fax', 'notes', 'grade'];
+
         $map = ['utilisateur_id' => 'id',
             'email' => 'email',
             'nom' => 'lastname',
@@ -134,9 +139,16 @@ class ExtranetMigration extends CubistCommand
             foreach ($map as $old => $new) {
                 $u->setAttribute($new, $e->$old);
             }
+            foreach ($extranetv1 as $item) {
+                $u->setAttribute('e1_' . $item, $e->$item);
+            }
             $u->setAttribute('api_token', Str::random(60));
             $u->setAttribute('address', ['address' => $e->adresse, 'postcode' => $e->code_postal, 'city' => $e->ville, 'country' => $e->pays]);
             $u->setAttribute('password', Hash::make($e->password));
+            if ($e->ws_password !== '') {
+                $u->setAttribute('e1_ws_password', Hash::make($e->ws_password));
+            }
+            $u->setAttribute('password', Hash::make($e->password));
             $u->setAttribute('created_at', new \DateTime('@' . $e->date_creation));
             $u->save();
         }
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 6c2e6a7..7616531 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -6,5 +6,5 @@ namespace App\Models;
 
 class Company extends \Cubedesigners\UserDatabase\Company
 {
-    protected $_syncDbSchema = false;
+
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 5b16e80..bf5f50d 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,5 +4,5 @@ namespace App\Models;
 
 class User extends \Cubedesigners\UserDatabase\User
 {
-    protected $_syncDbSchema = false;
+
 }
diff --git a/composer.lock b/composer.lock
index 5b03da9..7483e2f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -71,16 +71,16 @@
         },
         {
             "name": "backpack/crud",
-            "version": "4.1.8",
+            "version": "4.1.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Laravel-Backpack/CRUD.git",
-                "reference": "393a054490c97721186deb9faed20c6ed70ef6ef"
+                "reference": "cf33f991b97de99cefa1dcd2e6beeeeda8116514"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/393a054490c97721186deb9faed20c6ed70ef6ef",
-                "reference": "393a054490c97721186deb9faed20c6ed70ef6ef",
+                "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/cf33f991b97de99cefa1dcd2e6beeeeda8116514",
+                "reference": "cf33f991b97de99cefa1dcd2e6beeeeda8116514",
                 "shasum": ""
             },
             "require": {
@@ -151,7 +151,7 @@
                 "read",
                 "update"
             ],
-            "time": "2020-06-06T05:34:09+00:00"
+            "time": "2020-06-17T12:31:35+00:00"
         },
         {
             "name": "backpack/logmanager",
@@ -1070,13 +1070,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "15643e94b45f7fb59ca840d97e8b80db0e760dc8"
+                "reference": "035c4761ccb7ffcd3a65fe11d39815104600d68c"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-3442d1.tar",
-                "reference": "15643e94b45f7fb59ca840d97e8b80db0e760dc8",
-                "shasum": "39671c0dfd70aa5e4b7a7748b4ff4d99db20cc1a"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-6e8507.tar",
+                "reference": "035c4761ccb7ffcd3a65fe11d39815104600d68c",
+                "shasum": "650ba6598c79fbfbc7eb4884c8a64bf5a12fd2a2"
             },
             "require": {
                 "cubist/cms-back": "dev-master"
@@ -1084,7 +1084,7 @@
             "type": "library",
             "autoload": {
                 "psr-0": {
-                    "Cubedesigners\\Userdatabase\\": "src"
+                    "Cubedesigners\\UserDatabase\\": "src"
                 }
             },
             "license": [
@@ -1097,7 +1097,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2020-06-15T16:56:29+00:00"
+            "time": "2020-06-17T12:46:00+00:00"
         },
         {
             "name": "cubist/cms-back",
@@ -1105,13 +1105,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "a94f165f55e150ea4ee7236c1afc296e8bbf91bf"
+                "reference": "6e377875f3bb0d1f775415c2bca1a31f461d5814"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-5725ac.tar",
-                "reference": "a94f165f55e150ea4ee7236c1afc296e8bbf91bf",
-                "shasum": "e62fd265417da2bf2d6756184ef47990dce8afea"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-3d024d.tar",
+                "reference": "6e377875f3bb0d1f775415c2bca1a31f461d5814",
+                "shasum": "fa8a6333de7bcd67ddfdd50de62fe17a7a02c09f"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -1136,7 +1136,7 @@
                 "genealabs/laravel-model-caching": "^0.8.0",
                 "graham-campbell/markdown": "^12.0",
                 "lavary/laravel-menu": "^1.7",
-                "league/commonmark-ext-autolink": "^1.0",
+                "league/commonmark": "^1.4",
                 "predis/predis": "^1.1",
                 "spatie/laravel-honeypot": "^2.2",
                 "spatie/laravel-translatable": "^4.3",
@@ -1185,7 +1185,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-06-15T13:30:20+00:00"
+            "time": "2020-06-16T18:18:35+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -2096,16 +2096,16 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "2.1.17",
+            "version": "2.1.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "ade6887fd9bd74177769645ab5c474824f8a418a"
+                "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a",
-                "reference": "ade6887fd9bd74177769645ab5c474824f8a418a",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/cfa3d44471c7f5bfb684ac2b0da7114283d78441",
+                "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441",
                 "shasum": ""
             },
             "require": {
@@ -2129,7 +2129,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Egulias\\EmailValidator\\": "EmailValidator"
+                    "Egulias\\EmailValidator\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2150,7 +2150,7 @@
                 "validation",
                 "validator"
             ],
-            "time": "2020-02-13T22:36:52+00:00"
+            "time": "2020-06-16T20:11:17+00:00"
         },
         {
             "name": "elasticsearch/elasticsearch",
@@ -2555,16 +2555,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.4",
+            "version": "6.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
-                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                 "shasum": ""
             },
             "require": {
@@ -2572,7 +2572,7 @@
                 "guzzlehttp/promises": "^1.0",
                 "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "1.17.0"
+                "symfony/polyfill-intl-idn": "^1.17.0"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -2618,7 +2618,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2020-05-25T19:35:05+00:00"
+            "time": "2020-06-16T21:01:06+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -2814,16 +2814,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v7.15.0",
+            "version": "v7.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "739c44a3f7041430a3fb357f2dcfdb78f55005d7"
+                "reference": "dc9cd8338d222dec2d9962553639e08c4585fa5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/739c44a3f7041430a3fb357f2dcfdb78f55005d7",
-                "reference": "739c44a3f7041430a3fb357f2dcfdb78f55005d7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/dc9cd8338d222dec2d9962553639e08c4585fa5b",
+                "reference": "dc9cd8338d222dec2d9962553639e08c4585fa5b",
                 "shasum": ""
             },
             "require": {
@@ -2911,6 +2911,7 @@
             "suggest": {
                 "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
                 "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
+                "ext-ftp": "Required to use the Flysystem FTP driver.",
                 "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
                 "ext-memcached": "Required to use the memcache cache driver.",
                 "ext-pcntl": "Required to use all features of the queue worker.",
@@ -2966,7 +2967,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2020-06-09T14:00:25+00:00"
+            "time": "2020-06-16T14:31:25+00:00"
         },
         {
             "name": "lavary/laravel-menu",
@@ -3094,64 +3095,6 @@
             ],
             "time": "2020-05-04T22:15:21+00:00"
         },
-        {
-            "name": "league/commonmark-ext-autolink",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/commonmark-ext-autolink.git",
-                "reference": "1e90bb2e2accac569c60bfeee1b9ef6cec2b5f12"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark-ext-autolink/zipball/1e90bb2e2accac569c60bfeee1b9ef6cec2b5f12",
-                "reference": "1e90bb2e2accac569c60bfeee1b9ef6cec2b5f12",
-                "shasum": ""
-            },
-            "require": {
-                "league/commonmark": "^1.3",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.5"
-            },
-            "type": "commonmark-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\CommonMark\\Ext\\Autolink\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Colin O'Dell",
-                    "email": "colinodell@gmail.com",
-                    "homepage": "https://www.colinodell.com",
-                    "role": "Lead Developer"
-                }
-            ],
-            "description": "Extension for league/commonmark which autolinks URLs, emails, and @-mentions",
-            "homepage": "https://github.com/thephpleague/commonmark-ext-autolink",
-            "keywords": [
-                "autolink",
-                "commonmark",
-                "extension",
-                "gfm",
-                "github",
-                "markdown",
-                "twitter"
-            ],
-            "abandoned": "league/commonmark",
-            "time": "2020-04-04T14:19:36+00:00"
-        },
         {
             "name": "league/csv",
             "version": "9.6.0",
@@ -4693,16 +4636,16 @@
         },
         {
             "name": "spatie/laravel-backup",
-            "version": "6.10.0",
+            "version": "6.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "ac45933316893ec89883ebb9d9a51e9c6f13ebaa"
+                "reference": "3443aded89259f5e74335dc37fa96506a8aec1fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/ac45933316893ec89883ebb9d9a51e9c6f13ebaa",
-                "reference": "ac45933316893ec89883ebb9d9a51e9c6f13ebaa",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/3443aded89259f5e74335dc37fa96506a8aec1fe",
+                "reference": "3443aded89259f5e74335dc37fa96506a8aec1fe",
                 "shasum": ""
             },
             "require": {
@@ -4764,7 +4707,7 @@
                 "laravel-backup",
                 "spatie"
             ],
-            "time": "2020-05-20T19:11:25+00:00"
+            "time": "2020-06-15T16:18:35+00:00"
         },
         {
             "name": "spatie/laravel-googletagmanager",
@@ -5328,16 +5271,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0f0a271bc9b7d02a053d36fcdcb12662e2a8096e"
+                "reference": "34ac555a3627e324b660e318daa07572e1140123"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0f0a271bc9b7d02a053d36fcdcb12662e2a8096e",
-                "reference": "0f0a271bc9b7d02a053d36fcdcb12662e2a8096e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/34ac555a3627e324b660e318daa07572e1140123",
+                "reference": "34ac555a3627e324b660e318daa07572e1140123",
                 "shasum": ""
             },
             "require": {
@@ -5403,11 +5346,11 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2020-06-07T19:47:44+00:00"
+            "time": "2020-06-15T12:59:21+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -5563,7 +5506,7 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
@@ -5620,7 +5563,7 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -5750,7 +5693,7 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -5799,16 +5742,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa"
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
-                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75",
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75",
                 "shasum": ""
             },
             "require": {
@@ -5856,20 +5799,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-24T12:18:07+00:00"
+            "time": "2020-06-15T06:52:54+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "1151e5d51a680b22e758d05c6647dd9857503ec8"
+                "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1151e5d51a680b22e758d05c6647dd9857503ec8",
-                "reference": "1151e5d51a680b22e758d05c6647dd9857503ec8",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a18c27ace1ef344ffcb129a5b089bad7643b387a",
+                "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a",
                 "shasum": ""
             },
             "require": {
@@ -5955,11 +5898,11 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2020-06-12T11:25:56+00:00"
+            "time": "2020-06-15T13:51:38+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
@@ -6558,7 +6501,7 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -6608,7 +6551,7 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
@@ -6744,7 +6687,7 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
@@ -6815,7 +6758,7 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
@@ -6950,7 +6893,7 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
@@ -7276,16 +7219,16 @@
         },
         {
             "name": "voku/portable-ascii",
-            "version": "1.5.1",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "e7f9bd5deff09a57318f9b900ab33a05acfcf4d3"
+                "reference": "618631dc601d8eb6ea0a9fbf654ec82f066c4e97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/e7f9bd5deff09a57318f9b900ab33a05acfcf4d3",
-                "reference": "e7f9bd5deff09a57318f9b900ab33a05acfcf4d3",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/618631dc601d8eb6ea0a9fbf654ec82f066c4e97",
+                "reference": "618631dc601d8eb6ea0a9fbf654ec82f066c4e97",
                 "shasum": ""
             },
             "require": {
@@ -7320,7 +7263,7 @@
                 "clean",
                 "php"
             ],
-            "time": "2020-05-26T06:40:44+00:00"
+            "time": "2020-06-15T23:49:30+00:00"
         }
     ],
     "packages-dev": [
@@ -9111,16 +9054,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.1",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c"
+                "reference": "e61c593e9734b47ef462340c24fca8d6a57da14e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e61c593e9734b47ef462340c24fca8d6a57da14e",
+                "reference": "e61c593e9734b47ef462340c24fca8d6a57da14e",
                 "shasum": ""
             },
             "require": {
@@ -9156,7 +9099,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2020-05-06T09:56:31+00:00"
+            "time": "2020-06-16T07:00:44+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -9480,16 +9423,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.1",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1de7b33e1d1fa4a58cb29b295c6e3349d73a6c4e"
+                "reference": "266d85ef789da8c41f06af4093c43e9798af2784"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1de7b33e1d1fa4a58cb29b295c6e3349d73a6c4e",
-                "reference": "1de7b33e1d1fa4a58cb29b295c6e3349d73a6c4e",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/266d85ef789da8c41f06af4093c43e9798af2784",
+                "reference": "266d85ef789da8c41f06af4093c43e9798af2784",
                 "shasum": ""
             },
             "require": {
@@ -9540,7 +9483,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2020-06-15T13:14:18+00:00"
+            "time": "2020-06-15T15:04:48+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -10146,7 +10089,7 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -10236,16 +10179,16 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
                 "shasum": ""
             },
             "require": {
@@ -10253,6 +10196,7 @@
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
+                "phpstan/phpstan": "<0.12.20",
                 "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
@@ -10280,7 +10224,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-04-18T12:12:48+00:00"
+            "time": "2020-06-16T10:16:42+00:00"
         }
     ],
     "aliases": [],
diff --git a/{ b/{
new file mode 100644
index 0000000..e69de29
-- 
2.39.5