From: Dan Brown <redacted>
Date: Sat, 9 Dec 2017 12:48:08 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/lommes/BookStack into lommes-master
X-Git-Tag: v0.19.0~1^2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d17eb0f54cd1e12fae9a1d015f4ad4b6b6f764c6?hp=-c

Merge branch 'master' of git://github.com/lommes/BookStack into lommes-master
---

d17eb0f54cd1e12fae9a1d015f4ad4b6b6f764c6
diff --combined composer.json
index a4e4242c7,c86af0f45..5b9802f52
--- a/composer.json
+++ b/composer.json
@@@ -17,7 -17,8 +17,8 @@@
          "gathercontent/htmldiff": "^0.2.1",
          "barryvdh/laravel-snappy": "^0.4.0",
          "socialiteproviders/slack": "^3.0",
-         "socialiteproviders/microsoft-azure": "^3.0"
+         "socialiteproviders/microsoft-azure": "^3.0",
+         "socialiteproviders/okta": "^1.0"
      },
      "require-dev": {
          "filp/whoops": "~2.0",
@@@ -74,8 -75,6 +75,8 @@@
      "config": {
          "optimize-autoloader": true,
          "preferred-install": "dist",
 -        "php": "7.0"
 +        "platform": {
 +            "php": "7.0"
 +        }
      }
  }
diff --combined composer.lock
index 7623c7834,f52a2022b..057e6007a
--- a/composer.lock
+++ b/composer.lock
@@@ -4,20 -4,20 +4,20 @@@
          "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": "f5f180d7eca24ffd70ed8083f7a08107",
 -    "content-hash": "384c1805a51b16b9304ab3ac58f9554d",
++    "content-hash": "7d60f09393b99551e9ffdb6622ed7ade",
      "packages": [
          {
              "name": "aws/aws-sdk-php",
-             "version": "3.44.1",
 -            "version": "3.38.5",
++            "version": "3.45.3",
              "source": {
                  "type": "git",
                  "url": "https://github.com/aws/aws-sdk-php.git",
-                 "reference": "3f88cb0b9eb6ca34b2823c1cb42e10ac4d52fa6d"
 -                "reference": "13ffa481127c08e04244f116ae85a64b4172479c"
++                "reference": "d0abb0b1194fa64973b135191f56df991bc5787c"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3f88cb0b9eb6ca34b2823c1cb42e10ac4d52fa6d",
-                 "reference": "3f88cb0b9eb6ca34b2823c1cb42e10ac4d52fa6d",
 -                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/13ffa481127c08e04244f116ae85a64b4172479c",
 -                "reference": "13ffa481127c08e04244f116ae85a64b4172479c",
++                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d0abb0b1194fa64973b135191f56df991bc5787c",
++                "reference": "d0abb0b1194fa64973b135191f56df991bc5787c",
                  "shasum": ""
              },
              "require": {
@@@ -39,7 -39,7 +39,7 @@@
                  "ext-dom": "*",
                  "ext-openssl": "*",
                  "nette/neon": "^2.3",
--                "phpunit/phpunit": "^4.8.35|^5.4.0",
++                "phpunit/phpunit": "^4.8.35|^5.4.3",
                  "psr/cache": "^1.0"
              },
              "suggest": {
@@@ -84,7 -84,7 +84,7 @@@
                  "s3",
                  "sdk"
              ],
-             "time": "2017-12-01T20:57:47+00:00"
 -            "time": "2017-11-17T22:08:25+00:00"
++            "time": "2017-12-08T21:36:50+00:00"
          },
          {
              "name": "barryvdh/laravel-dompdf",
@@@ -377,16 -377,16 +377,16 @@@
          },
          {
              "name": "dompdf/dompdf",
 -            "version": "v0.8.1",
 +            "version": "v0.8.2",
              "source": {
                  "type": "git",
                  "url": "https://github.com/dompdf/dompdf.git",
 -                "reference": "9ea852c4bdc74fac5def165e6cd52353f7ca3b3f"
 +                "reference": "5113accd9ae5d466077cce5208dcf3fb871bf8f6"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/9ea852c4bdc74fac5def165e6cd52353f7ca3b3f",
 -                "reference": "9ea852c4bdc74fac5def165e6cd52353f7ca3b3f",
 +                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5113accd9ae5d466077cce5208dcf3fb871bf8f6",
 +                "reference": "5113accd9ae5d466077cce5208dcf3fb871bf8f6",
                  "shasum": ""
              },
              "require": {
@@@ -395,7 -395,7 +395,7 @@@
                  "ext-mbstring": "*",
                  "phenx/php-font-lib": "0.5.*",
                  "phenx/php-svg-lib": "0.3.*",
 -                "php": ">=5.3.0"
 +                "php": ">=5.4.0"
              },
              "require-dev": {
                  "phpunit/phpunit": "4.8.*",
@@@ -435,7 -435,7 +435,7 @@@
              ],
              "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
              "homepage": "https://github.com/dompdf/dompdf",
 -            "time": "2017-09-14T01:36:24+00:00"
 +            "time": "2017-11-26T14:49:08+00:00"
          },
          {
              "name": "egulias/email-validator",
@@@ -898,25 -898,25 +898,25 @@@
          },
          {
              "name": "knplabs/knp-snappy",
--            "version": "v1.0.2",
++            "version": "v1.0.3",
              "source": {
                  "type": "git",
                  "url": "https://github.com/KnpLabs/snappy.git",
--                "reference": "e6a29846ca759ea268a1bca4455b8a14815a3976"
++                "reference": "68590ef3aa94425b1c0019cc28ce471729f51fcb"
              },
              "dist": {
                  "type": "zip",
--                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/e6a29846ca759ea268a1bca4455b8a14815a3976",
--                "reference": "e6a29846ca759ea268a1bca4455b8a14815a3976",
++                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/68590ef3aa94425b1c0019cc28ce471729f51fcb",
++                "reference": "68590ef3aa94425b1c0019cc28ce471729f51fcb",
                  "shasum": ""
              },
              "require": {
                  "php": ">=5.6",
                  "psr/log": "^1.0",
--                "symfony/process": "~2.3|~3.0"
++                "symfony/process": "~2.3 || ~3.0 || ~4.0"
              },
              "require-dev": {
--                "phpunit/phpunit": "~4.7"
++                "phpunit/phpunit": "~4.8.36"
              },
              "suggest": {
                  "h4cc/wkhtmltoimage-amd64": "Provides wkhtmltoimage-amd64 binary for Linux-compatible machines, use version `~0.12` as dependency",
@@@ -960,20 -960,20 +960,20 @@@
                  "thumbnail",
                  "wkhtmltopdf"
              ],
--            "time": "2017-10-04T19:39:41+00:00"
++            "time": "2017-12-03T23:18:18+00:00"
          },
          {
              "name": "laravel/framework",
-             "version": "v5.5.23",
 -            "version": "v5.5.21",
++            "version": "v5.5.24",
              "source": {
                  "type": "git",
                  "url": "https://github.com/laravel/framework.git",
-                 "reference": "cb8ec95aa65fbaeeaf94026c8a9f04bb97c13777"
 -                "reference": "6321069a75723d88103526903d3192f0b231544a"
++                "reference": "06135405bb1f736dac5e9529ed1541fc446c9c0f"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/laravel/framework/zipball/cb8ec95aa65fbaeeaf94026c8a9f04bb97c13777",
-                 "reference": "cb8ec95aa65fbaeeaf94026c8a9f04bb97c13777",
 -                "url": "https://api.github.com/repos/laravel/framework/zipball/6321069a75723d88103526903d3192f0b231544a",
 -                "reference": "6321069a75723d88103526903d3192f0b231544a",
++                "url": "https://api.github.com/repos/laravel/framework/zipball/06135405bb1f736dac5e9529ed1541fc446c9c0f",
++                "reference": "06135405bb1f736dac5e9529ed1541fc446c9c0f",
                  "shasum": ""
              },
              "require": {
@@@ -1093,7 -1093,7 +1093,7 @@@
                  "framework",
                  "laravel"
              ],
-             "time": "2017-12-04T14:19:08+00:00"
 -            "time": "2017-11-14T15:08:13+00:00"
++            "time": "2017-12-07T01:28:21+00:00"
          },
          {
              "name": "laravel/socialite",
@@@ -2161,6 -2161,43 +2161,43 @@@
              "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",
              "time": "2017-01-25T09:48:29+00:00"
          },
+         {
+             "name": "socialiteproviders/okta",
+             "version": "v1.0.0",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/SocialiteProviders/Okta.git",
+                 "reference": "dcda13432c80060cd84d4cb5f2af422d280ab895"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/SocialiteProviders/Okta/zipball/dcda13432c80060cd84d4cb5f2af422d280ab895",
+                 "reference": "dcda13432c80060cd84d4cb5f2af422d280ab895",
+                 "shasum": ""
+             },
+             "require": {
+                 "php": "^5.6 || ^7.0",
+                 "socialiteproviders/manager": "~2.0 || ~3.0"
+             },
+             "type": "library",
+             "autoload": {
+                 "psr-4": {
+                     "SocialiteProviders\\Okta\\": ""
+                 }
+             },
+             "notification-url": "https://packagist.org/downloads/",
+             "license": [
+                 "MIT"
+             ],
+             "authors": [
+                 {
+                     "name": "Chase Coney",
+                     "email": "chase.coney@gmail.com"
+                 }
+             ],
+             "description": "Okta OAuth2 Provider for Laravel Socialite",
+             "time": "2017-11-21T05:31:47+00:00"
+         },
          {
              "name": "socialiteproviders/slack",
              "version": "v3.0.3",
@@@ -2255,20 -2292,20 +2292,20 @@@
          },
          {
              "name": "symfony/console",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/console.git",
 -                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805"
 +                "reference": "b0878233cb5c4391347e5495089c7af11b8e6201"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/console/zipball/63cd7960a0a522c3537f6326706d7f3b8de65805",
 -                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805",
 +                "url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201",
 +                "reference": "b0878233cb5c4391347e5495089c7af11b8e6201",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8",
 +                "php": ">=5.5.9",
                  "symfony/debug": "~2.8|~3.0",
                  "symfony/polyfill-mbstring": "~1.0"
              },
@@@ -2281,7 -2318,6 +2318,7 @@@
                  "symfony/dependency-injection": "~3.3",
                  "symfony/event-dispatcher": "~2.8|~3.0",
                  "symfony/filesystem": "~2.8|~3.0",
 +                "symfony/http-kernel": "~2.8|~3.0",
                  "symfony/process": "~2.8|~3.0"
              },
              "suggest": {
@@@ -2320,7 -2356,7 +2357,7 @@@
              ],
              "description": "Symfony Console Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-16T15:24:32+00:00"
 +            "time": "2017-07-29T21:27:59+00:00"
          },
          {
              "name": "symfony/css-selector",
@@@ -2377,20 -2413,20 +2414,20 @@@
          },
          {
              "name": "symfony/debug",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/debug.git",
 -                "reference": "74557880e2846b5c84029faa96b834da37e29810"
 +                "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/debug/zipball/74557880e2846b5c84029faa96b834da37e29810",
 -                "reference": "74557880e2846b5c84029faa96b834da37e29810",
 +                "url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
 +                "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8",
 +                "php": ">=5.5.9",
                  "psr/log": "~1.0"
              },
              "conflict": {
@@@ -2429,24 -2465,24 +2466,24 @@@
              ],
              "description": "Symfony Debug Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-10T16:38:39+00:00"
 +            "time": "2017-07-28T15:27:31+00:00"
          },
          {
              "name": "symfony/event-dispatcher",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/event-dispatcher.git",
 -                "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9"
 +                "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/271d8c27c3ec5ecee6e2ac06016232e249d638d9",
 -                "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9",
 +                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e",
 +                "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8"
 +                "php": ">=5.5.9"
              },
              "conflict": {
                  "symfony/dependency-injection": "<3.3"
@@@ -2492,24 -2528,24 +2529,24 @@@
              ],
              "description": "Symfony EventDispatcher Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-05T15:47:03+00:00"
 +            "time": "2017-06-09T14:53:08+00:00"
          },
          {
              "name": "symfony/finder",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/finder.git",
 -                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880"
 +                "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/finder/zipball/138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
 -                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
 +                "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4",
 +                "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8"
 +                "php": ">=5.5.9"
              },
              "type": "library",
              "extra": {
@@@ -2541,24 -2577,24 +2578,24 @@@
              ],
              "description": "Symfony Finder Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-05T15:47:03+00:00"
 +            "time": "2017-06-01T21:01:25+00:00"
          },
          {
              "name": "symfony/http-foundation",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/http-foundation.git",
 -                "reference": "5943f0f19817a7e05992d20a90729b0dc93faf36"
 +                "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5943f0f19817a7e05992d20a90729b0dc93faf36",
 -                "reference": "5943f0f19817a7e05992d20a90729b0dc93faf36",
 +                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49e8cd2d59a7aa9bfab19e46de680c76e500a031",
 +                "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8",
 +                "php": ">=5.5.9",
                  "symfony/polyfill-mbstring": "~1.1"
              },
              "require-dev": {
@@@ -2594,28 -2630,28 +2631,28 @@@
              ],
              "description": "Symfony HttpFoundation Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-13T18:13:16+00:00"
 +            "time": "2017-07-21T11:04:46+00:00"
          },
          {
              "name": "symfony/http-kernel",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/http-kernel.git",
 -                "reference": "a2a942172b742217ab2ccd9399494af2aa17c766"
 +                "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a2a942172b742217ab2ccd9399494af2aa17c766",
 -                "reference": "a2a942172b742217ab2ccd9399494af2aa17c766",
 +                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db10d05f1d95e4168e638db7a81c79616f568ea5",
 +                "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8",
 +                "php": ">=5.5.9",
                  "psr/log": "~1.0",
                  "symfony/debug": "~2.8|~3.0",
                  "symfony/event-dispatcher": "~2.8|~3.0",
 -                "symfony/http-foundation": "^3.3.11"
 +                "symfony/http-foundation": "~3.3"
              },
              "conflict": {
                  "symfony/config": "<2.8",
@@@ -2680,7 -2716,7 +2717,7 @@@
              ],
              "description": "Symfony HttpKernel Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-16T18:14:43+00:00"
 +            "time": "2017-08-01T10:25:59+00:00"
          },
          {
              "name": "symfony/polyfill-mbstring",
@@@ -2743,20 -2779,20 +2780,20 @@@
          },
          {
              "name": "symfony/process",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/process.git",
 -                "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d"
 +                "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/process/zipball/a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d",
 -                "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d",
 +                "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a",
 +                "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8"
 +                "php": ">=5.5.9"
              },
              "type": "library",
              "extra": {
@@@ -2788,24 -2824,24 +2825,24 @@@
              ],
              "description": "Symfony Process Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-13T15:31:11+00:00"
 +            "time": "2017-07-13T13:05:09+00:00"
          },
          {
              "name": "symfony/routing",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/routing.git",
 -                "reference": "cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95"
 +                "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/routing/zipball/cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95",
 -                "reference": "cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95",
 +                "url": "https://api.github.com/repos/symfony/routing/zipball/4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26",
 +                "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8"
 +                "php": ">=5.5.9"
              },
              "conflict": {
                  "symfony/config": "<2.8",
@@@ -2866,24 -2902,24 +2903,24 @@@
                  "uri",
                  "url"
              ],
 -            "time": "2017-11-07T14:16:22+00:00"
 +            "time": "2017-07-21T17:43:13+00:00"
          },
          {
              "name": "symfony/translation",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/translation.git",
 -                "reference": "373e553477e55cd08f8b86b74db766c75b987fdb"
 +                "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/translation/zipball/373e553477e55cd08f8b86b74db766c75b987fdb",
 -                "reference": "373e553477e55cd08f8b86b74db766c75b987fdb",
 +                "url": "https://api.github.com/repos/symfony/translation/zipball/35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3",
 +                "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8",
 +                "php": ">=5.5.9",
                  "symfony/polyfill-mbstring": "~1.0"
              },
              "conflict": {
@@@ -2931,24 -2967,24 +2968,24 @@@
              ],
              "description": "Symfony Translation Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-07T14:12:55+00:00"
 +            "time": "2017-06-24T16:45:30+00:00"
          },
          {
              "name": "symfony/var-dumper",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/var-dumper.git",
 -                "reference": "805de6bd6869073e60610df1b14ab7d969c61b01"
 +                "reference": "b2623bccb969ad595c2090f9be498b74670d0663"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/805de6bd6869073e60610df1b14ab7d969c61b01",
 -                "reference": "805de6bd6869073e60610df1b14ab7d969c61b01",
 +                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2623bccb969ad595c2090f9be498b74670d0663",
 +                "reference": "b2623bccb969ad595c2090f9be498b74670d0663",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8",
 +                "php": ">=5.5.9",
                  "symfony/polyfill-mbstring": "~1.0"
              },
              "conflict": {
@@@ -2999,7 -3035,7 +3036,7 @@@
                  "debug",
                  "dump"
              ],
 -            "time": "2017-11-07T14:16:22+00:00"
 +            "time": "2017-07-28T06:06:09+00:00"
          },
          {
              "name": "tijsverkoyen/css-to-inline-styles",
@@@ -3292,32 -3328,32 +3329,32 @@@
          },
          {
              "name": "doctrine/instantiator",
 -            "version": "1.1.0",
 +            "version": "1.0.5",
              "source": {
                  "type": "git",
                  "url": "https://github.com/doctrine/instantiator.git",
 -                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
 +                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
 -                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
 +                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
 +                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
                  "shasum": ""
              },
              "require": {
 -                "php": "^7.1"
 +                "php": ">=5.3,<8.0-DEV"
              },
              "require-dev": {
                  "athletic/athletic": "~0.1.8",
                  "ext-pdo": "*",
                  "ext-phar": "*",
 -                "phpunit/phpunit": "^6.2.3",
 -                "squizlabs/php_codesniffer": "^3.0.2"
 +                "phpunit/phpunit": "~4.0",
 +                "squizlabs/php_codesniffer": "~2.0"
              },
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "1.2.x-dev"
 +                    "dev-master": "1.0.x-dev"
                  }
              },
              "autoload": {
@@@ -3342,20 -3378,20 +3379,20 @@@
                  "constructor",
                  "instantiate"
              ],
 -            "time": "2017-07-22T11:58:36+00:00"
 +            "time": "2015-06-14T21:17:01+00:00"
          },
          {
              "name": "filp/whoops",
 -            "version": "2.1.13",
 +            "version": "2.1.14",
              "source": {
                  "type": "git",
                  "url": "https://github.com/filp/whoops.git",
 -                "reference": "9f640a4f129e57d3537887f840380109a4dd182b"
 +                "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/filp/whoops/zipball/9f640a4f129e57d3537887f840380109a4dd182b",
 -                "reference": "9f640a4f129e57d3537887f840380109a4dd182b",
 +                "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6",
 +                "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6",
                  "shasum": ""
              },
              "require": {
@@@ -3403,7 -3439,7 +3440,7 @@@
                  "throwable",
                  "whoops"
              ],
 -            "time": "2017-11-17T08:15:51+00:00"
 +            "time": "2017-11-23T18:22:44+00:00"
          },
          {
              "name": "fzaninotto/faker",
@@@ -3880,35 -3916,29 +3917,35 @@@
          },
          {
              "name": "phpdocumentor/reflection-docblock",
 -            "version": "4.1.1",
 +            "version": "4.2.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
 -                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
 +                "reference": "66465776cfc249844bde6d117abff1d22e06c2da"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
 -                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
 +                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da",
 +                "reference": "66465776cfc249844bde6d117abff1d22e06c2da",
                  "shasum": ""
              },
              "require": {
                  "php": "^7.0",
 -                "phpdocumentor/reflection-common": "^1.0@dev",
 +                "phpdocumentor/reflection-common": "^1.0.0",
                  "phpdocumentor/type-resolver": "^0.4.0",
                  "webmozart/assert": "^1.0"
              },
              "require-dev": {
 -                "mockery/mockery": "^0.9.4",
 -                "phpunit/phpunit": "^4.4"
 +                "doctrine/instantiator": "~1.0.5",
 +                "mockery/mockery": "^1.0",
 +                "phpunit/phpunit": "^6.4"
              },
              "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "4.x-dev"
 +                }
 +            },
              "autoload": {
                  "psr-4": {
                      "phpDocumentor\\Reflection\\": [
@@@ -3927,7 -3957,7 +3964,7 @@@
                  }
              ],
              "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
 -            "time": "2017-08-30T18:51:59+00:00"
 +            "time": "2017-11-27T17:38:31+00:00"
          },
          {
              "name": "phpdocumentor/type-resolver",
@@@ -3978,16 -4008,16 +4015,16 @@@
          },
          {
              "name": "phpspec/prophecy",
 -            "version": "v1.7.2",
 +            "version": "1.7.3",
              "source": {
                  "type": "git",
                  "url": "https://github.com/phpspec/prophecy.git",
 -                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
 +                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
 -                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
 +                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
 +                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
                  "shasum": ""
              },
              "require": {
@@@ -3999,7 -4029,7 +4036,7 @@@
              },
              "require-dev": {
                  "phpspec/phpspec": "^2.5|^3.2",
 -                "phpunit/phpunit": "^4.8 || ^5.6.5"
 +                "phpunit/phpunit": "^4.8.35 || ^5.7"
              },
              "type": "library",
              "extra": {
@@@ -4037,20 -4067,20 +4074,20 @@@
                  "spy",
                  "stub"
              ],
 -            "time": "2017-09-04T11:05:03+00:00"
 +            "time": "2017-11-24T13:59:53+00:00"
          },
          {
              "name": "phpunit/php-code-coverage",
-             "version": "5.2.4",
 -            "version": "5.2.3",
++            "version": "5.3.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                 "reference": "033ec97498cf530cc1be4199264cad568b19be26"
 -                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d"
++                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/033ec97498cf530cc1be4199264cad568b19be26",
-                 "reference": "033ec97498cf530cc1be4199264cad568b19be26",
 -                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
 -                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
++                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
++                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
                  "shasum": ""
              },
              "require": {
@@@ -4059,14 -4089,14 +4096,13 @@@
                  "php": "^7.0",
                  "phpunit/php-file-iterator": "^1.4.2",
                  "phpunit/php-text-template": "^1.2.1",
 -                "phpunit/php-token-stream": "^2.0",
 +                "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": {
--                "ext-xdebug": "^2.5",
                  "phpunit/phpunit": "^6.0"
              },
              "suggest": {
@@@ -4075,7 -4105,7 +4111,7 @@@
              "type": "library",
              "extra": {
                  "branch-alias": {
--                    "dev-master": "5.2.x-dev"
++                    "dev-master": "5.3.x-dev"
                  }
              },
              "autoload": {
@@@ -4090,7 -4120,7 +4126,7 @@@
              "authors": [
                  {
                      "name": "Sebastian Bergmann",
--                    "email": "sb@sebastian-bergmann.de",
++                    "email": "sebastian@phpunit.de",
                      "role": "lead"
                  }
              ],
@@@ -4101,20 -4131,20 +4137,20 @@@
                  "testing",
                  "xunit"
              ],
-             "time": "2017-11-27T09:00:30+00:00"
 -            "time": "2017-11-03T13:47:33+00:00"
++            "time": "2017-12-06T09:29:45+00:00"
          },
          {
              "name": "phpunit/php-file-iterator",
 -            "version": "1.4.2",
 +            "version": "1.4.5",
              "source": {
                  "type": "git",
                  "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
 -                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
 +                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
 -                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
 +                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
 +                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
                  "shasum": ""
              },
              "require": {
@@@ -4148,7 -4178,7 +4184,7 @@@
                  "filesystem",
                  "iterator"
              ],
 -            "time": "2016-10-03T07:40:28+00:00"
 +            "time": "2017-11-27T13:52:08+00:00"
          },
          {
              "name": "phpunit/php-text-template",
@@@ -4242,16 -4272,16 +4278,16 @@@
          },
          {
              "name": "phpunit/php-token-stream",
 -            "version": "2.0.1",
 +            "version": "2.0.2",
              "source": {
                  "type": "git",
                  "url": "https://github.com/sebastianbergmann/php-token-stream.git",
 -                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"
 +                "reference": "791198a2c6254db10131eecfe8c06670700904db"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
 -                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",
 +                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
 +                "reference": "791198a2c6254db10131eecfe8c06670700904db",
                  "shasum": ""
              },
              "require": {
@@@ -4287,20 -4317,20 +4323,20 @@@
              "keywords": [
                  "tokenizer"
              ],
 -            "time": "2017-08-20T05:47:52+00:00"
 +            "time": "2017-11-27T05:48:46+00:00"
          },
          {
              "name": "phpunit/phpunit",
-             "version": "6.5.2",
 -            "version": "6.4.4",
++            "version": "6.5.3",
              "source": {
                  "type": "git",
                  "url": "https://github.com/sebastianbergmann/phpunit.git",
-                 "reference": "24b708f2fd725bcef1c8153b366043381aa324f2"
 -                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932"
++                "reference": "882e886cc928a0abd3c61282b2a64026237d14a4"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/24b708f2fd725bcef1c8153b366043381aa324f2",
-                 "reference": "24b708f2fd725bcef1c8153b366043381aa324f2",
 -                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932",
 -                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932",
++                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/882e886cc928a0abd3c61282b2a64026237d14a4",
++                "reference": "882e886cc928a0abd3c61282b2a64026237d14a4",
                  "shasum": ""
              },
              "require": {
@@@ -4314,12 -4344,12 +4350,12 @@@
                  "phar-io/version": "^1.0",
                  "php": "^7.0",
                  "phpspec/prophecy": "^1.7",
-                 "phpunit/php-code-coverage": "^5.2.3",
 -                "phpunit/php-code-coverage": "^5.2.2",
 -                "phpunit/php-file-iterator": "^1.4.2",
++                "phpunit/php-code-coverage": "^5.3",
 +                "phpunit/php-file-iterator": "^1.4.3",
                  "phpunit/php-text-template": "^1.2.1",
                  "phpunit/php-timer": "^1.0.9",
 -                "phpunit/phpunit-mock-objects": "^4.0.3",
 -                "sebastian/comparator": "^2.0.2",
 +                "phpunit/phpunit-mock-objects": "^5.0.4",
 +                "sebastian/comparator": "^2.1",
                  "sebastian/diff": "^2.0",
                  "sebastian/environment": "^3.1",
                  "sebastian/exporter": "^3.1",
@@@ -4345,7 -4375,7 +4381,7 @@@
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "6.4.x-dev"
 +                    "dev-master": "6.5.x-dev"
                  }
              },
              "autoload": {
@@@ -4371,20 -4401,20 +4407,20 @@@
                  "testing",
                  "xunit"
              ],
-             "time": "2017-12-02T05:36:24+00:00"
 -            "time": "2017-11-08T11:26:09+00:00"
++            "time": "2017-12-06T09:42:03+00:00"
          },
          {
              "name": "phpunit/phpunit-mock-objects",
 -            "version": "4.0.4",
 +            "version": "5.0.4",
              "source": {
                  "type": "git",
                  "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
 -                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0"
 +                "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0",
 -                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0",
 +                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/16b50f4167e5e85e81ca8a3dd105d0a5fd32009a",
 +                "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a",
                  "shasum": ""
              },
              "require": {
@@@ -4397,7 -4427,7 +4433,7 @@@
                  "phpunit/phpunit": "<6.0"
              },
              "require-dev": {
 -                "phpunit/phpunit": "^6.0"
 +                "phpunit/phpunit": "^6.5"
              },
              "suggest": {
                  "ext-soap": "*"
@@@ -4405,7 -4435,7 +4441,7 @@@
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "4.0.x-dev"
 +                    "dev-master": "5.0.x-dev"
                  }
              },
              "autoload": {
@@@ -4420,7 -4450,7 +4456,7 @@@
              "authors": [
                  {
                      "name": "Sebastian Bergmann",
 -                    "email": "sb@sebastian-bergmann.de",
 +                    "email": "sebastian@phpunit.de",
                      "role": "lead"
                  }
              ],
@@@ -4430,7 -4460,7 +4466,7 @@@
                  "mock",
                  "xunit"
              ],
 -            "time": "2017-08-03T14:08:16+00:00"
 +            "time": "2017-12-02T05:31:19+00:00"
          },
          {
              "name": "sebastian/code-unit-reverse-lookup",
@@@ -4993,20 -5023,20 +5029,20 @@@
          },
          {
              "name": "symfony/class-loader",
 -            "version": "v3.3.13",
 +            "version": "v3.3.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/class-loader.git",
 -                "reference": "df173ac2af96ce202bf8bb5a3fc0bec8a4fdd4d1"
 +                "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/class-loader/zipball/df173ac2af96ce202bf8bb5a3fc0bec8a4fdd4d1",
 -                "reference": "df173ac2af96ce202bf8bb5a3fc0bec8a4fdd4d1",
 +                "url": "https://api.github.com/repos/symfony/class-loader/zipball/386a294d621576302e7cc36965d6ed53b8c73c4f",
 +                "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f",
                  "shasum": ""
              },
              "require": {
 -                "php": "^5.5.9|>=7.0.8"
 +                "php": ">=5.5.9"
              },
              "require-dev": {
                  "symfony/finder": "~2.8|~3.0",
@@@ -5045,7 -5075,7 +5081,7 @@@
              ],
              "description": "Symfony ClassLoader Component",
              "homepage": "https://symfony.com",
 -            "time": "2017-11-05T15:47:03+00:00"
 +            "time": "2017-06-02T09:51:43+00:00"
          },
          {
              "name": "symfony/dom-crawler",
@@@ -5203,8 -5233,5 +5239,8 @@@
          "php": ">=7.0.0",
          "ext-tidy": "*"
      },
 -    "platform-dev": []
 +    "platform-dev": [],
 +    "platform-overrides": {
 +        "php": "7.0"
 +    }
  }