From: Dan Brown 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 Merge branch 'master' of git://github.com/lommes/BookStack into lommes-master --- d17eb0f54cd1e12fae9a1d015f4ad4b6b6f764c6 diff --cc 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", @@@ -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", @@@ -4041,16 -4071,16 +4078,16 @@@ }, { "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": { @@@ -4066,7 -4096,7 +4103,6 @@@ "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,7 -4131,7 +4137,7 @@@ "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", @@@ -4291,16 -4321,16 +4327,16 @@@ }, { "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", @@@ -4371,7 -4401,7 +4407,7 @@@ "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",