Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-29 23:22:34 +01:00
Code Issues Releases Wiki Activity

Updated composer deps, applied latest StyleCI changes

Browse Source
This commit is contained in:
Dan Brown 2022-04-24 18:22:40 +01:00
parent 63cb6015a8
commit 2b0ae23da0
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
14 changed files with 182 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Entities/Tools/Markdown/MarkdownToHtml.php
View File

@ -12,7 +12,6 @@ use League\CommonMark\Extension\TaskList\TaskListExtension;
class MarkdownToHtml
{
protected string $markdown;
public function __construct(string $markdown)
@ -33,5 +32,4 @@ class MarkdownToHtml
return $converter->convertToHtml($this->markdown);
}
}
}

3
app/Entities/Tools/PageEditorData.php
View File

@ -112,5 +112,4 @@ class PageEditorData
{
return setting('app-editor') === 'markdown' ? 'markdown' : 'wysiwyg';
}
}
}

1
app/Http/Controllers/Api/AttachmentApiController.php
View File

@ -90,6 +90,7 @@ class AttachmentApiController extends ApiController
// Simply return a JSON response of the attachment for link-based attachments
if ($attachment->external) {
$attachment->setAttribute('content', $attachment->path);
return response()->json($attachment);
}

10
app/Http/Controllers/Controller.php
View File

@ -126,7 +126,7 @@ abstract class Controller extends BaseController
*/
protected function streamedDownloadResponse($stream, string $fileName): StreamedResponse
{
return response()->stream(function() use ($stream) {
return response()->stream(function () use ($stream) {
// End & flush the output buffer otherwise we still seem to use memory.
// Ignore in testing since output buffers are used to gather a response.
if (!app()->runningUnitTests()) {
@ -167,10 +167,10 @@ abstract class Controller extends BaseController
$sniffContent = fread($stream, 1000);
$mime = (new WebSafeMimeSniffer())->sniff($sniffContent);
return response()->stream(function() use ($sniffContent, $stream) {
echo $sniffContent;
fpassthru($stream);
fclose($stream);
return response()->stream(function () use ($sniffContent, $stream) {
echo $sniffContent;
fpassthru($stream);
fclose($stream);
}, 200, [
'Content-Type' => $mime,
'Content-Disposition' => 'inline; filename="' . str_replace('"', '', $fileName) . '"',

2
app/Http/Controllers/SettingController.php
View File

@ -19,7 +19,7 @@ class SettingController extends Controller
}
/**
* Handle requests to the settings index path
* Handle requests to the settings index path.
*/
public function index()
{

4
app/Uploads/AttachmentService.php
View File

@ -76,12 +76,12 @@ class AttachmentService
/**
* Stream an attachment from storage.
*
* @return resource|null
* @throws FileNotFoundException
*
* @return resource|null
*/
public function streamAttachmentFromStorage(Attachment $attachment)
{
return $this->getStorageDisk()->readStream($this->adjustPathForStorageDisk($attachment->path));
}

327
composer.lock generated
View File

@ -58,16 +58,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.217.0",
"version": "3.220.3",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "a8cca383b13fe6cde479a4745b4d3dfe893fdc69"
"reference": "fbb2d7349916c15758ee02dfd001a714883a9adf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a8cca383b13fe6cde479a4745b4d3dfe893fdc69",
"reference": "a8cca383b13fe6cde479a4745b4d3dfe893fdc69",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fbb2d7349916c15758ee02dfd001a714883a9adf",
"reference": "fbb2d7349916c15758ee02dfd001a714883a9adf",
"shasum": ""
},
"require": {
@ -75,9 +75,9 @@
"ext-json": "*",
"ext-pcre": "*",
"ext-simplexml": "*",
"guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
"guzzlehttp/guzzle": "^5.3.3 || ^6.2.1 || ^7.0",
"guzzlehttp/promises": "^1.4.0",
"guzzlehttp/psr7": "^1.7.0|^2.0",
"guzzlehttp/psr7": "^1.7.0 || ^2.1.1",
"mtdowling/jmespath.php": "^2.6",
"php": ">=5.5"
},
@ -92,7 +92,7 @@
"ext-sockets": "*",
"nette/neon": "^2.3",
"paragonie/random_compat": ">= 2",
"phpunit/phpunit": "^4.8.35|^5.4.3",
"phpunit/phpunit": "^4.8.35 || ^5.6.3",
"psr/cache": "^1.0",
"psr/simple-cache": "^1.0",
"sebastian/comparator": "^1.2.3"
@ -143,9 +143,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.217.0"
"source": "https://github.com/aws/aws-sdk-php/tree/3.220.3"
},
"time": "2022-03-30T18:18:30+00:00"
"time": "2022-04-22T18:18:31+00:00"
},
{
"name": "bacon/bacon-qr-code",
@ -563,16 +563,16 @@
},
{
"name": "doctrine/dbal",
"version": "3.3.4",
"version": "3.3.5",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "83f779beaea1893c0bece093ab2104c6d15a7f26"
"reference": "719663b15983278227669c8595151586a2ff3327"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/83f779beaea1893c0bece093ab2104c6d15a7f26",
"reference": "83f779beaea1893c0bece093ab2104c6d15a7f26",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/719663b15983278227669c8595151586a2ff3327",
"reference": "719663b15983278227669c8595151586a2ff3327",
"shasum": ""
},
"require": {
@ -587,7 +587,7 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
"phpstan/phpstan": "1.4.6",
"phpstan/phpstan": "1.5.3",
"phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "9.5.16",
"psalm/plugin-phpunit": "0.16.1",
@ -654,7 +654,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.3.4"
"source": "https://github.com/doctrine/dbal/tree/3.3.5"
},
"funding": [
{
@ -670,7 +670,7 @@
"type": "tidelift"
}
],
"time": "2022-03-20T18:37:29+00:00"
"time": "2022-04-05T09:50:18+00:00"
},
{
"name": "doctrine/deprecations",
@ -1788,16 +1788,16 @@
},
{
"name": "laravel/framework",
"version": "v8.83.6",
"version": "v8.83.9",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "dffcec0cb686eafaa3b8f33db11da2cd9d69af1c"
"reference": "ac6e16bb56510eda2e373c6365d5c92da3fd559d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/dffcec0cb686eafaa3b8f33db11da2cd9d69af1c",
"reference": "dffcec0cb686eafaa3b8f33db11da2cd9d69af1c",
"url": "https://api.github.com/repos/laravel/framework/zipball/ac6e16bb56510eda2e373c6365d5c92da3fd559d",
"reference": "ac6e16bb56510eda2e373c6365d5c92da3fd559d",
"shasum": ""
},
"require": {
@ -1957,7 +1957,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2022-03-29T14:41:02+00:00"
"time": "2022-04-19T15:01:38+00:00"
},
{
"name": "laravel/serializable-closure",
@ -2545,16 +2545,16 @@
},
{
"name": "league/mime-type-detection",
"version": "1.9.0",
"version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git",
"reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69"
"reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/aa70e813a6ad3d1558fc927863d47309b4c23e69",
"reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69",
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
"reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
"shasum": ""
},
"require": {
@ -2585,7 +2585,7 @@
"description": "Mime-type detection for Flysystem",
"support": {
"issues": "https://github.com/thephpleague/mime-type-detection/issues",
"source": "https://github.com/thephpleague/mime-type-detection/tree/1.9.0"
"source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0"
},
"funding": [
{
@ -2597,20 +2597,20 @@
"type": "tidelift"
}
],
"time": "2021-11-21T11:48:40+00:00"
"time": "2022-04-17T13:12:02+00:00"
},
{
"name": "league/oauth1-client",
"version": "v1.10.0",
"version": "v1.10.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth1-client.git",
"reference": "88dd16b0cff68eb9167bfc849707d2c40ad91ddc"
"reference": "d6365b901b5c287dd41f143033315e2f777e1167"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/88dd16b0cff68eb9167bfc849707d2c40ad91ddc",
"reference": "88dd16b0cff68eb9167bfc849707d2c40ad91ddc",
"url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167",
"reference": "d6365b901b5c287dd41f143033315e2f777e1167",
"shasum": ""
},
"require": {
@ -2671,9 +2671,9 @@
],
"support": {
"issues": "https://github.com/thephpleague/oauth1-client/issues",
"source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.0"
"source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.1"
},
"time": "2021-08-15T23:05:49+00:00"
"time": "2022-04-15T14:02:14+00:00"
},
{
"name": "league/oauth2-client",
@ -2747,16 +2747,16 @@
},
{
"name": "monolog/monolog",
"version": "2.4.0",
"version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "d7fd7450628561ba697b7097d86db72662f54aef"
"reference": "4192345e260f1d51b365536199744b987e160edc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef",
"reference": "d7fd7450628561ba697b7097d86db72662f54aef",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/4192345e260f1d51b365536199744b987e160edc",
"reference": "4192345e260f1d51b365536199744b987e160edc",
"shasum": ""
},
"require": {
@ -2830,7 +2830,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
"source": "https://github.com/Seldaek/monolog/tree/2.4.0"
"source": "https://github.com/Seldaek/monolog/tree/2.5.0"
},
"funding": [
{
@ -2842,7 +2842,7 @@
"type": "tidelift"
}
],
"time": "2022-03-14T12:44:37+00:00"
"time": "2022-04-08T15:43:54+00:00"
},
{
"name": "mtdowling/jmespath.php",
@ -3458,16 +3458,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.13",
"version": "3.0.14",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e"
"reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/1443ab79364eea48665fa8c09ac67f37d1025f7e",
"reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
"reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
"shasum": ""
},
"require": {
@ -3476,9 +3476,7 @@
"php": ">=5.6.1"
},
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "^5.7|^6.0|^9.4",
"squizlabs/php_codesniffer": "~2.0"
"phpunit/phpunit": "*"
},
"suggest": {
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
@ -3549,7 +3547,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.13"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.14"
},
"funding": [
{
@ -3565,7 +3563,7 @@
"type": "tidelift"
}
],
"time": "2022-01-30T08:50:05+00:00"
"time": "2022-04-04T05:15:45+00:00"
},
{
"name": "pragmarx/google2fa",
@ -4957,16 +4955,16 @@
},
{
"name": "symfony/console",
"version": "v5.4.5",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "d8111acc99876953f52fe16d4c50eb60940d49ad"
"reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/d8111acc99876953f52fe16d4c50eb60940d49ad",
"reference": "d8111acc99876953f52fe16d4c50eb60940d49ad",
"url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6",
"reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6",
"shasum": ""
},
"require": {
@ -5036,7 +5034,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v5.4.5"
"source": "https://github.com/symfony/console/tree/v5.4.7"
},
"funding": [
{
@ -5052,7 +5050,7 @@
"type": "tidelift"
}
],
"time": "2022-02-24T12:45:35+00:00"
"time": "2022-03-31T17:09:19+00:00"
},
{
"name": "symfony/css-selector",
@ -5122,16 +5120,16 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v2.5.0",
"version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
"reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
"reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
"shasum": ""
},
"require": {
@ -5169,7 +5167,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
},
"funding": [
{
@ -5185,20 +5183,20 @@
"type": "tidelift"
}
],
"time": "2021-07-12T14:48:14+00:00"
"time": "2022-01-02T09:53:40+00:00"
},
{
"name": "symfony/error-handler",
"version": "v5.4.3",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "c4ffc2cd919950d13c8c9ce32a70c70214c3ffc5"
"reference": "060bc01856a1846e3e4385261bc9ed11a1dd7b6a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/c4ffc2cd919950d13c8c9ce32a70c70214c3ffc5",
"reference": "c4ffc2cd919950d13c8c9ce32a70c70214c3ffc5",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/060bc01856a1846e3e4385261bc9ed11a1dd7b6a",
"reference": "060bc01856a1846e3e4385261bc9ed11a1dd7b6a",
"shasum": ""
},
"require": {
@ -5240,7 +5238,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/error-handler/tree/v5.4.3"
"source": "https://github.com/symfony/error-handler/tree/v5.4.7"
},
"funding": [
{
@ -5256,7 +5254,7 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:53:40+00:00"
"time": "2022-03-18T16:21:29+00:00"
},
{
"name": "symfony/event-dispatcher",
@ -5345,16 +5343,16 @@
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v2.5.0",
"version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"
"reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
"reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
"reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
"shasum": ""
},
"require": {
@ -5404,7 +5402,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0"
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.1"
},
"funding": [
{
@ -5420,7 +5418,7 @@
"type": "tidelift"
}
],
"time": "2021-07-12T14:48:14+00:00"
"time": "2022-01-02T09:53:40+00:00"
},
{
"name": "symfony/finder",
@ -5560,16 +5558,16 @@
},
{
"name": "symfony/http-kernel",
"version": "v5.4.6",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "d41f29ae9af1b5f40c7ebcddf09082953229411d"
"reference": "509243b9b3656db966284c45dffce9316c1ecc5c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/d41f29ae9af1b5f40c7ebcddf09082953229411d",
"reference": "d41f29ae9af1b5f40c7ebcddf09082953229411d",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/509243b9b3656db966284c45dffce9316c1ecc5c",
"reference": "509243b9b3656db966284c45dffce9316c1ecc5c",
"shasum": ""
},
"require": {
@ -5652,7 +5650,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v5.4.6"
"source": "https://github.com/symfony/http-kernel/tree/v5.4.7"
},
"funding": [
{
@ -5668,20 +5666,20 @@
"type": "tidelift"
}
],
"time": "2022-03-05T21:14:51+00:00"
"time": "2022-04-02T06:04:20+00:00"
},
{
"name": "symfony/mime",
"version": "v5.4.3",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "e1503cfb5c9a225350f549d3bb99296f4abfb80f"
"reference": "92d27a34dea2e199fa9b687e3fff3a7d169b7b1c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/e1503cfb5c9a225350f549d3bb99296f4abfb80f",
"reference": "e1503cfb5c9a225350f549d3bb99296f4abfb80f",
"url": "https://api.github.com/repos/symfony/mime/zipball/92d27a34dea2e199fa9b687e3fff3a7d169b7b1c",
"reference": "92d27a34dea2e199fa9b687e3fff3a7d169b7b1c",
"shasum": ""
},
"require": {
@ -5735,7 +5733,7 @@
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v5.4.3"
"source": "https://github.com/symfony/mime/tree/v5.4.7"
},
"funding": [
{
@ -5751,7 +5749,7 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:53:40+00:00"
"time": "2022-03-11T16:08:05+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -6572,16 +6570,16 @@
},
{
"name": "symfony/process",
"version": "v5.4.5",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "95440409896f90a5f85db07a32b517ecec17fa4c"
"reference": "38a44b2517b470a436e1c944bf9b9ba3961137fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/95440409896f90a5f85db07a32b517ecec17fa4c",
"reference": "95440409896f90a5f85db07a32b517ecec17fa4c",
"url": "https://api.github.com/repos/symfony/process/zipball/38a44b2517b470a436e1c944bf9b9ba3961137fb",
"reference": "38a44b2517b470a436e1c944bf9b9ba3961137fb",
"shasum": ""
},
"require": {
@ -6614,7 +6612,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v5.4.5"
"source": "https://github.com/symfony/process/tree/v5.4.7"
},
"funding": [
{
@ -6630,7 +6628,7 @@
"type": "tidelift"
}
],
"time": "2022-01-30T18:16:22+00:00"
"time": "2022-03-18T16:18:52+00:00"
},
{
"name": "symfony/routing",
@ -6724,22 +6722,22 @@
},
{
"name": "symfony/service-contracts",
"version": "v2.5.0",
"version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
"reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
"reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
"reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"psr/container": "^1.1",
"symfony/deprecation-contracts": "^2.1"
"symfony/deprecation-contracts": "^2.1|^3"
},
"conflict": {
"ext-psr": "<1.1|>=2"
@ -6787,7 +6785,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
"source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
},
"funding": [
{
@ -6803,7 +6801,7 @@
"type": "tidelift"
}
],
"time": "2021-11-04T16:48:04+00:00"
"time": "2022-03-13T20:07:29+00:00"
},
{
"name": "symfony/string",
@ -6893,16 +6891,16 @@
},
{
"name": "symfony/translation",
"version": "v5.4.6",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "a7ca9fdfffb0174209440c2ffa1dee228e15d95b"
"reference": "e1eb790575202ee3ac2659f55b93b05853726f8e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/a7ca9fdfffb0174209440c2ffa1dee228e15d95b",
"reference": "a7ca9fdfffb0174209440c2ffa1dee228e15d95b",
"url": "https://api.github.com/repos/symfony/translation/zipball/e1eb790575202ee3ac2659f55b93b05853726f8e",
"reference": "e1eb790575202ee3ac2659f55b93b05853726f8e",
"shasum": ""
},
"require": {
@ -6970,7 +6968,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v5.4.6"
"source": "https://github.com/symfony/translation/tree/v5.4.7"
},
"funding": [
{
@ -6986,20 +6984,20 @@
"type": "tidelift"
}
],
"time": "2022-03-02T12:56:28+00:00"
"time": "2022-03-24T17:09:09+00:00"
},
{
"name": "symfony/translation-contracts",
"version": "v2.5.0",
"version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
"reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e"
"reference": "1211df0afa701e45a04253110e959d4af4ef0f07"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e",
"reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07",
"reference": "1211df0afa701e45a04253110e959d4af4ef0f07",
"shasum": ""
},
"require": {
@ -7048,7 +7046,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/translation-contracts/tree/v2.5.0"
"source": "https://github.com/symfony/translation-contracts/tree/v2.5.1"
},
"funding": [
{
@ -7064,7 +7062,7 @@
"type": "tidelift"
}
],
"time": "2021-08-17T14:20:01+00:00"
"time": "2022-01-02T09:53:40+00:00"
},
{
"name": "symfony/var-dumper",
@ -7500,16 +7498,16 @@
},
{
"name": "composer/composer",
"version": "2.3.1",
"version": "2.3.5",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "d6c572e5f5d6d1a27bb7a1fbd1c74f777a26d436"
"reference": "50c47b1f907cfcdb8f072b88164d22b527557ae1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/d6c572e5f5d6d1a27bb7a1fbd1c74f777a26d436",
"reference": "d6c572e5f5d6d1a27bb7a1fbd1c74f777a26d436",
"url": "https://api.github.com/repos/composer/composer/zipball/50c47b1f907cfcdb8f072b88164d22b527557ae1",
"reference": "50c47b1f907cfcdb8f072b88164d22b527557ae1",
"shasum": ""
},
"require": {
@ -7585,7 +7583,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/2.3.1"
"source": "https://github.com/composer/composer/tree/2.3.5"
},
"funding": [
{
@ -7601,7 +7599,7 @@
"type": "tidelift"
}
],
"time": "2022-03-30T13:41:28+00:00"
"time": "2022-04-13T14:43:00+00:00"
},
{
"name": "composer/metadata-minifier",
@ -7745,16 +7743,16 @@
},
{
"name": "composer/semver",
"version": "3.3.1",
"version": "3.3.2",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "5d8e574bb0e69188786b8ef77d43341222a41a71"
"reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/5d8e574bb0e69188786b8ef77d43341222a41a71",
"reference": "5d8e574bb0e69188786b8ef77d43341222a41a71",
"url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
"reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
"shasum": ""
},
"require": {
@ -7806,7 +7804,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues",
"source": "https://github.com/composer/semver/tree/3.3.1"
"source": "https://github.com/composer/semver/tree/3.3.2"
},
"funding": [
{
@ -7822,7 +7820,7 @@
"type": "tidelift"
}
],
"time": "2022-03-16T11:22:07+00:00"
"time": "2022-04-01T19:23:25+00:00"
},
{
"name": "composer/spdx-licenses",
@ -8213,16 +8211,16 @@
},
{
"name": "itsgoingd/clockwork",
"version": "v5.1.5",
"version": "v5.1.6",
"source": {
"type": "git",
"url": "https://github.com/itsgoingd/clockwork.git",
"reference": "6a7b3942224fa53cf3704d9adba636e1f3dfeb9a"
"reference": "9df41432da1d8cb39c7fda383ddcc02231c83ff3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/6a7b3942224fa53cf3704d9adba636e1f3dfeb9a",
"reference": "6a7b3942224fa53cf3704d9adba636e1f3dfeb9a",
"url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/9df41432da1d8cb39c7fda383ddcc02231c83ff3",
"reference": "9df41432da1d8cb39c7fda383ddcc02231c83ff3",
"shasum": ""
},
"require": {
@ -8269,7 +8267,7 @@
],
"support": {
"issues": "https://github.com/itsgoingd/clockwork/issues",
"source": "https://github.com/itsgoingd/clockwork/tree/v5.1.5"
"source": "https://github.com/itsgoingd/clockwork/tree/v5.1.6"
},
"funding": [
{
@ -8277,20 +8275,20 @@
"type": "github"
}
],
"time": "2022-02-13T22:57:42+00:00"
"time": "2022-04-12T21:35:47+00:00"
},
{
"name": "justinrainbow/json-schema",
"version": "5.2.11",
"version": "5.2.12",
"source": {
"type": "git",
"url": "https://github.com/justinrainbow/json-schema.git",
"reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa"
"reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa",
"reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
"reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
"shasum": ""
},
"require": {
@ -8345,9 +8343,9 @@
],
"support": {
"issues": "https://github.com/justinrainbow/json-schema/issues",
"source": "https://github.com/justinrainbow/json-schema/tree/5.2.11"
"source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
},
"time": "2021-07-22T09:24:00+00:00"
"time": "2022-04-13T08:02:27+00:00"
},
{
"name": "mockery/mockery",
@ -9005,16 +9003,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.5.2",
"version": "1.5.7",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c"
"reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f32e95f571c9587b4e14be05253ae56fedd00b2c",
"reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
"reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
"shasum": ""
},
"require": {
@ -9040,7 +9038,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.5.2"
"source": "https://github.com/phpstan/phpstan/tree/1.5.7"
},
"funding": [
{
@ -9060,7 +9058,7 @@
"type": "tidelift"
}
],
"time": "2022-03-29T07:34:36+00:00"
"time": "2022-04-20T12:20:27+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -9382,16 +9380,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.19",
"version": "9.5.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
"reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
"shasum": ""
},
"require": {
@ -9469,7 +9467,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
},
"funding": [
{
@ -9481,7 +9479,7 @@
"type": "github"
}
],
"time": "2022-03-15T09:57:31+00:00"
"time": "2022-04-01T12:37:26+00:00"
},
{
"name": "react/promise",
@ -9925,16 +9923,16 @@
},
{
"name": "sebastian/environment",
"version": "5.1.3",
"version": "5.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "388b6ced16caa751030f6a69e588299fa09200ac"
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
"reference": "388b6ced16caa751030f6a69e588299fa09200ac",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
"shasum": ""
},
"require": {
@ -9976,7 +9974,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
},
"funding": [
{
@ -9984,7 +9982,7 @@
"type": "github"
}
],
"time": "2020-09-28T05:52:38+00:00"
"time": "2022-04-03T09:37:03+00:00"
},
{
"name": "sebastian/exporter",
@ -10525,23 +10523,24 @@
},
{
"name": "seld/jsonlint",
"version": "1.8.3",
"version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
"reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57"
"reference": "4211420d25eba80712bff236a98960ef68b866b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9ad6ce79c342fbd44df10ea95511a1b24dee5b57",
"reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7",
"reference": "4211420d25eba80712bff236a98960ef68b866b7",
"shasum": ""
},
"require": {
"php": "^5.3 || ^7.0 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
"phpstan/phpstan": "^1.5",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
},
"bin": [
"bin/jsonlint"
@ -10572,7 +10571,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/jsonlint/issues",
"source": "https://github.com/Seldaek/jsonlint/tree/1.8.3"
"source": "https://github.com/Seldaek/jsonlint/tree/1.9.0"
},
"funding": [
{
@ -10584,7 +10583,7 @@
"type": "tidelift"
}
],
"time": "2020-11-11T09:19:24+00:00"
"time": "2022-04-01T13:37:23+00:00"
},
{
"name": "seld/phar-utils",
@ -10711,16 +10710,16 @@
},
{
"name": "symfony/filesystem",
"version": "v5.4.6",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "d53a45039974952af7f7ebc461ccdd4295e29440"
"reference": "3a4442138d80c9f7b600fb297534ac718b61d37f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/d53a45039974952af7f7ebc461ccdd4295e29440",
"reference": "d53a45039974952af7f7ebc461ccdd4295e29440",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/3a4442138d80c9f7b600fb297534ac718b61d37f",
"reference": "3a4442138d80c9f7b600fb297534ac718b61d37f",
"shasum": ""
},
"require": {
@ -10755,7 +10754,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v5.4.6"
"source": "https://github.com/symfony/filesystem/tree/v5.4.7"
},
"funding": [
{
@ -10771,7 +10770,7 @@
"type": "tidelift"
}
],
"time": "2022-03-02T12:42:23+00:00"
"time": "2022-04-01T12:33:59+00:00"
},
{
"name": "theseer/tokenizer",

4
database/migrations/2022_04_17_101741_add_editor_change_field_and_permission.php
View File

@ -16,7 +16,7 @@ class AddEditorChangeFieldAndPermission extends Migration
public function up()
{
// Add the new 'editor' column to the pages table
Schema::table('pages', function(Blueprint $table) {
Schema::table('pages', function (Blueprint $table) {
$table->string('editor', 50)->default('');
});
@ -52,7 +52,7 @@ class AddEditorChangeFieldAndPermission extends Migration
public function down()
{
// Drop the new column from the pages table
Schema::table('pages', function(Blueprint $table) {
Schema::table('pages', function (Blueprint $table) {
$table->dropColumn('editor');
});

2
tests/Api/BooksApiTest.php
View File

@ -110,7 +110,7 @@ class BooksApiTest extends TestCase
DB::table('books')->where('id', '=', $book->id)->update(['updated_at' => Carbon::now()->subWeek()]);
$details = [
'tags' => [['name' => 'Category', 'value' => 'Testing']]
'tags' => [['name' => 'Category', 'value' => 'Testing']],
];
$this->putJson($this->baseEndpoint . "/{$book->id}", $details);

2
tests/Api/ChaptersApiTest.php
View File

@ -156,7 +156,7 @@ class ChaptersApiTest extends TestCase
DB::table('chapters')->where('id', '=', $chapter->id)->update(['updated_at' => Carbon::now()->subWeek()]);
$details = [
'tags' => [['name' => 'Category', 'value' => 'Testing']]
'tags' => [['name' => 'Category', 'value' => 'Testing']],
];
$this->putJson($this->baseEndpoint . "/{$chapter->id}", $details);

2
tests/Api/PagesApiTest.php
View File

@ -249,7 +249,7 @@ class PagesApiTest extends TestCase
DB::table('pages')->where('id', '=', $page->id)->update(['updated_at' => Carbon::now()->subWeek()]);
$details = [
'tags' => [['name' => 'Category', 'value' => 'Testing']]
'tags' => [['name' => 'Category', 'value' => 'Testing']],
];
$resp = $this->putJson($this->baseEndpoint . "/{$page->id}", $details);

2
tests/Api/ShelvesApiTest.php
View File

@ -120,7 +120,7 @@ class ShelvesApiTest extends TestCase
DB::table('bookshelves')->where('id', '=', $shelf->id)->update(['updated_at' => Carbon::now()->subWeek()]);
$details = [
'tags' => [['name' => 'Category', 'value' => 'Testing']]
'tags' => [['name' => 'Category', 'value' => 'Testing']],
];
$this->putJson($this->baseEndpoint . "/{$shelf->id}", $details);

3
tests/Entity/PageEditorTest.php
View File

@ -128,7 +128,7 @@ class PageEditorTest extends TestCase
$resp = $this->asAdmin()->get($page->getUrl('/edit?editor=markdown-stable'));
$resp->assertStatus(200);
$resp->assertSee("<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>", true);
$resp->assertSee('<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>', true);
$resp->assertElementExists('[component="markdown-editor"]');
}
@ -202,5 +202,4 @@ class PageEditorTest extends TestCase
$this->asEditor()->put($page->getUrl(), ['name' => $page->name, 'markdown' => '## Updated content abc']);
$this->assertEquals('wysiwyg', $page->refresh()->editor);
}
}

2
tests/UrlTest.php
View File

@ -3,8 +3,8 @@
namespace Tests;
use BookStack\Http\Request;
use function url;
use function request;
use function url;
class UrlTest extends TestCase
{