From: Dan Brown Date: Wed, 28 Feb 2024 12:11:39 +0000 (+0000) Subject: Merge branch 'v23-12' into development X-Git-Tag: v24.02~1^2~4 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c4279c9697d512556f8920f011a48f3af4b815a1?hp=-c Merge branch 'v23-12' into development Updated composer deps again to take lock file to current --- c4279c9697d512556f8920f011a48f3af4b815a1 diff --combined composer.lock index 99f496a11,c27012f5e..e1033b5b2 --- a/composer.lock +++ b/composer.lock @@@ -62,16 -62,16 +62,16 @@@ }, { "name": "aws/aws-sdk-php", - "version": "3.300.0", - "version": "3.300.4", ++ "version": "3.300.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14" - "reference": "27d59c22c121ce9c0041c563dc9d7270e180925c" ++ "reference": "957ccef631684d612d01ced2fa3b0506f2ec78c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67a0c22a70bdcc99ca41028b78be3d5496481c14", - "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/27d59c22c121ce9c0041c563dc9d7270e180925c", - "reference": "27d59c22c121ce9c0041c563dc9d7270e180925c", ++ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/957ccef631684d612d01ced2fa3b0506f2ec78c3", ++ "reference": "957ccef631684d612d01ced2fa3b0506f2ec78c3", "shasum": "" }, "require": { @@@ -151,9 -151,9 +151,9 @@@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.300.0" - "source": "https://github.com/aws/aws-sdk-php/tree/3.300.4" ++ "source": "https://github.com/aws/aws-sdk-php/tree/3.300.6" }, - "time": "2024-02-19T19:08:33+00:00" - "time": "2024-02-23T19:10:30+00:00" ++ "time": "2024-02-27T19:05:27+00:00" }, { "name": "bacon/bacon-qr-code", @@@ -3599,16 -3599,16 +3599,16 @@@ }, { "name": "nikic/php-parser", - "version": "v5.0.0", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", - "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69", + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69", "shasum": "" }, "require": { @@@ -3651,9 -3651,9 +3651,9 @@@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1" }, - "time": "2024-01-07T17:17:35+00:00" + "time": "2024-02-21T19:24:10+00:00" }, { "name": "nunomaduro/termwind", @@@ -4081,16 -4081,16 +4081,16 @@@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.35", + "version": "3.0.36", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "4b1827beabce71953ca479485c0ae9c51287f2fe" + "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4b1827beabce71953ca479485c0ae9c51287f2fe", - "reference": "4b1827beabce71953ca479485c0ae9c51287f2fe", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c2fb5136162d4be18fdd4da9980696f3aee96d7b", + "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b", "shasum": "" }, "require": { @@@ -4171,7 -4171,7 +4171,7 @@@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.35" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.36" }, "funding": [ { @@@ -4187,7 -4187,7 +4187,7 @@@ "type": "tidelift" } ], - "time": "2023-12-29T01:59:53+00:00" + "time": "2024-02-26T05:13:14+00:00" }, { "name": "pragmarx/google2fa", @@@ -8279,22 -8279,29 +8279,29 @@@ }, { "name": "itsgoingd/clockwork", - "version": "v5.1.12", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/itsgoingd/clockwork.git", - "reference": "c9dbdbb1f0efd19bb80f1080ef63f1b9b1bc3b1b" + "reference": "df52c7c4d8d60443ea1d14bcf9b182d4eaaeec26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/c9dbdbb1f0efd19bb80f1080ef63f1b9b1bc3b1b", - "reference": "c9dbdbb1f0efd19bb80f1080ef63f1b9b1bc3b1b", + "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/df52c7c4d8d60443ea1d14bcf9b182d4eaaeec26", + "reference": "df52c7c4d8d60443ea1d14bcf9b182d4eaaeec26", "shasum": "" }, "require": { "ext-json": "*", "php": ">=5.6" }, + "suggest": { + "ext-pdo": "Needed in order to use a SQL database for metadata storage", + "ext-pdo_mysql": "Needed in order to use MySQL for metadata storage", + "ext-pdo_postgres": "Needed in order to use Postgres for metadata storage", + "ext-pdo_sqlite": "Needed in order to use a SQLite for metadata storage", + "ext-redis": "Needed in order to use Redis for metadata storage" + }, "type": "library", "extra": { "laravel": { @@@ -8335,7 -8342,7 +8342,7 @@@ ], "support": { "issues": "https://github.com/itsgoingd/clockwork/issues", - "source": "https://github.com/itsgoingd/clockwork/tree/v5.1.12" + "source": "https://github.com/itsgoingd/clockwork/tree/v5.2.0" }, "funding": [ { @@@ -8343,20 -8350,20 +8350,20 @@@ "type": "github" } ], - "time": "2022-12-13T00:04:12+00:00" + "time": "2024-02-20T22:36:44+00:00" }, { "name": "larastan/larastan", -- "version": "v2.9.0", ++ "version": "v2.9.1", "source": { "type": "git", "url": "https://github.com/larastan/larastan.git", -- "reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01" ++ "reference": "467113c58d110ad617cf9e07ff49b0948d1c03cc" }, "dist": { "type": "zip", -- "url": "https://api.github.com/repos/larastan/larastan/zipball/35fa9cbe1895e76215bbe74571a344f2705fbe01", -- "reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01", ++ "url": "https://api.github.com/repos/larastan/larastan/zipball/467113c58d110ad617cf9e07ff49b0948d1c03cc", ++ "reference": "467113c58d110ad617cf9e07ff49b0948d1c03cc", "shasum": "" }, "require": { @@@ -8424,7 -8431,7 +8431,7 @@@ ], "support": { "issues": "https://github.com/larastan/larastan/issues", -- "source": "https://github.com/larastan/larastan/tree/v2.9.0" ++ "source": "https://github.com/larastan/larastan/tree/v2.9.1" }, "funding": [ { @@@ -8444,7 -8451,7 +8451,7 @@@ "type": "patreon" } ], -- "time": "2024-02-13T11:49:22+00:00" ++ "time": "2024-02-26T14:10:20+00:00" }, { "name": "mockery/mockery", @@@ -9258,16 -9265,16 +9265,16 @@@ }, { "name": "phpunit/phpunit", - "version": "9.6.16", + "version": "9.6.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd", + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd", "shasum": "" }, "require": { @@@ -9341,7 -9348,7 +9348,7 @@@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17" }, "funding": [ { @@@ -9357,7 -9364,7 +9364,7 @@@ "type": "tidelift" } ], - "time": "2024-01-19T07:03:14+00:00" + "time": "2024-02-23T13:14:51+00:00" }, { "name": "sebastian/cli-parser",