colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v21.05.x' into release

This commit is contained in:
Dan Brown 2021-07-03 11:59:21 +01:00
parent 7792cb3915 b1ee1a856f
commit e01f23583f
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
15 changed files with 201 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Theming/ThemeService.php
View File

@ -45,7 +45,7 @@ class ThemeService
public function readThemeActions() public function readThemeActions()
{ {
$themeActionsFile = theme_path('functions.php'); $themeActionsFile = theme_path('functions.php');
if (file_exists($themeActionsFile)) { if ($themeActionsFile && file_exists($themeActionsFile)) {
require $themeActionsFile; require $themeActionsFile;
} }
} }

3
app/Translation/FileLoader.php
View File

@ -20,7 +20,8 @@ class FileLoader extends BaseLoader
} }
if (is_null($namespace) || $namespace === '*') { if (is_null($namespace) || $namespace === '*') {
$themeTranslations = $this->loadPath(theme_path('lang'), $locale, $group); $themePath = theme_path('lang');
$themeTranslations = $themePath ? $this->loadPath($themePath, $locale, $group) : [];
$originalTranslations = $this->loadPath($this->path, $locale, $group); $originalTranslations = $this->loadPath($this->path, $locale, $group);
return array_merge($originalTranslations, $themeTranslations); return array_merge($originalTranslations, $themeTranslations);
} }

6
app/helpers.php
View File

@ -94,13 +94,15 @@ function setting(string $key = null, $default = null)
/** /**
* Get a path to a theme resource. * Get a path to a theme resource.
* Returns null if a theme is not configured and
* therefore a full path is not available for use.
*/ */
function theme_path(string $path = ''): string function theme_path(string $path = ''): ?string
{ {
$theme = config('view.theme'); $theme = config('view.theme');
if (!$theme) { if (!$theme) {
return ''; return null;
} }
return base_path('themes/' . $theme .($path ? DIRECTORY_SEPARATOR.$path : $path)); return base_path('themes/' . $theme .($path ? DIRECTORY_SEPARATOR.$path : $path));

270
composer.lock generated
View File

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.184.2", "version": "3.185.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "78fe691ab466fecf195209672f6c00c5d4ed219a" "reference": "35310302912fdc3b4a0e829b84424c41e3fd9727"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/78fe691ab466fecf195209672f6c00c5d4ed219a", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/35310302912fdc3b4a0e829b84424c41e3fd9727",
"reference": "78fe691ab466fecf195209672f6c00c5d4ed219a", "reference": "35310302912fdc3b4a0e829b84424c41e3fd9727",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -92,9 +92,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.184.2" "source": "https://github.com/aws/aws-sdk-php/tree/3.185.6"
}, },
"time": "2021-06-11T18:20:15+00:00" "time": "2021-07-02T18:13:18+00:00"
}, },
{ {
"name": "barryvdh/laravel-dompdf", "name": "barryvdh/laravel-dompdf",
@ -229,16 +229,16 @@
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "1.11.3", "version": "2.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "3bb5588cec00a0268829cc4a518490df6741af9d" "reference": "c9622c6820d3ede1e2315a6a377ea1076e421d88"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d", "url": "https://api.github.com/repos/doctrine/cache/zipball/c9622c6820d3ede1e2315a6a377ea1076e421d88",
"reference": "3bb5588cec00a0268829cc4a518490df6741af9d", "reference": "c9622c6820d3ede1e2315a6a377ea1076e421d88",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -308,7 +308,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/cache/issues", "issues": "https://github.com/doctrine/cache/issues",
"source": "https://github.com/doctrine/cache/tree/1.11.3" "source": "https://github.com/doctrine/cache/tree/2.0.3"
}, },
"funding": [ "funding": [
{ {
@ -324,35 +324,36 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-25T09:01:55+00:00" "time": "2021-05-25T09:43:04+00:00"
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "2.13.1", "version": "2.13.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "c800380457948e65bbd30ba92cc17cda108bf8c9" "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9", "url": "https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4",
"reference": "c800380457948e65bbd30ba92cc17cda108bf8c9", "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/cache": "^1.0", "doctrine/cache": "^1.0|^2.0",
"doctrine/deprecations": "^0.5.3", "doctrine/deprecations": "^0.5.3",
"doctrine/event-manager": "^1.0", "doctrine/event-manager": "^1.0",
"ext-pdo": "*", "ext-pdo": "*",
"php": "^7.1 || ^8" "php": "^7.1 || ^8"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "8.2.0", "doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2020.2", "jetbrains/phpstorm-stubs": "2020.2",
"phpstan/phpstan": "0.12.81", "phpstan/phpstan": "0.12.81",
"phpunit/phpunit": "^7.5.20|^8.5|9.5.0", "phpunit/phpunit": "^7.5.20|^8.5|9.5.5",
"squizlabs/php_codesniffer": "3.6.0", "squizlabs/php_codesniffer": "3.6.0",
"symfony/cache": "^4.4",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "4.6.4" "vimeo/psalm": "4.6.4"
}, },
@ -415,7 +416,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/2.13.1" "source": "https://github.com/doctrine/dbal/tree/2.13.2"
}, },
"funding": [ "funding": [
{ {
@ -431,7 +432,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-17T17:30:19+00:00" "time": "2021-06-18T21:48:39+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -1651,16 +1652,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.20.27", "version": "v6.20.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "92c0417e60efc39bc556ba5dfc9b20a56f7848fb" "reference": "00fa9c04aed10d68481f5757b89da0e6798f53b3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/92c0417e60efc39bc556ba5dfc9b20a56f7848fb", "url": "https://api.github.com/repos/laravel/framework/zipball/00fa9c04aed10d68481f5757b89da0e6798f53b3",
"reference": "92c0417e60efc39bc556ba5dfc9b20a56f7848fb", "reference": "00fa9c04aed10d68481f5757b89da0e6798f53b3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1800,7 +1801,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-05-11T14:00:28+00:00" "time": "2021-06-22T13:41:06+00:00"
}, },
{ {
"name": "laravel/socialite", "name": "laravel/socialite",
@ -1873,16 +1874,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.6.2", "version": "1.6.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "7d70d2f19c84bcc16275ea47edabee24747352eb" "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/44ffd8d3c4a9133e4bd0548622b09c55af39db5f",
"reference": "7d70d2f19c84bcc16275ea47edabee24747352eb", "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1900,7 +1901,7 @@
"github/gfm": "0.29.0", "github/gfm": "0.29.0",
"michelf/php-markdown": "~1.4", "michelf/php-markdown": "~1.4",
"mikehaertl/php-shellcommand": "^1.4", "mikehaertl/php-shellcommand": "^1.4",
"phpstan/phpstan": "^0.12", "phpstan/phpstan": "^0.12.90",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.2", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2",
"scrutinizer/ocular": "^1.5", "scrutinizer/ocular": "^1.5",
"symfony/finder": "^4.2" "symfony/finder": "^4.2"
@ -1970,20 +1971,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-12T11:39:41+00:00" "time": "2021-06-26T11:57:13+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.1.3", "version": "1.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "9be3b16c877d477357c015cec057548cf9b2a14a" "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
"reference": "9be3b16c877d477357c015cec057548cf9b2a14a", "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1999,7 +2000,6 @@
"phpunit/phpunit": "^8.5.8" "phpunit/phpunit": "^8.5.8"
}, },
"suggest": { "suggest": {
"ext-fileinfo": "Required for MimeType",
"ext-ftp": "Allows you to use FTP server storage", "ext-ftp": "Allows you to use FTP server storage",
"ext-openssl": "Allows you to use FTPS server storage", "ext-openssl": "Allows you to use FTPS server storage",
"league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
@ -2057,7 +2057,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/flysystem/issues", "issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/1.x" "source": "https://github.com/thephpleague/flysystem/tree/1.1.4"
}, },
"funding": [ "funding": [
{ {
@ -2065,7 +2065,7 @@
"type": "other" "type": "other"
} }
], ],
"time": "2020-08-23T07:39:11+00:00" "time": "2021-06-23T21:56:05+00:00"
}, },
{ {
"name": "league/flysystem-aws-s3-v3", "name": "league/flysystem-aws-s3-v3",
@ -2347,16 +2347,16 @@
}, },
{ {
"name": "mtdowling/jmespath.php", "name": "mtdowling/jmespath.php",
"version": "2.6.0", "version": "2.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/jmespath/jmespath.php.git", "url": "https://github.com/jmespath/jmespath.php.git",
"reference": "42dae2cbd13154083ca6d70099692fef8ca84bfb" "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb", "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
"reference": "42dae2cbd13154083ca6d70099692fef8ca84bfb", "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2364,7 +2364,7 @@
"symfony/polyfill-mbstring": "^1.17" "symfony/polyfill-mbstring": "^1.17"
}, },
"require-dev": { "require-dev": {
"composer/xdebug-handler": "^1.4", "composer/xdebug-handler": "^1.4 || ^2.0",
"phpunit/phpunit": "^4.8.36 || ^7.5.15" "phpunit/phpunit": "^4.8.36 || ^7.5.15"
}, },
"bin": [ "bin": [
@ -2402,22 +2402,22 @@
], ],
"support": { "support": {
"issues": "https://github.com/jmespath/jmespath.php/issues", "issues": "https://github.com/jmespath/jmespath.php/issues",
"source": "https://github.com/jmespath/jmespath.php/tree/2.6.0" "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1"
}, },
"time": "2020-07-31T21:01:56+00:00" "time": "2021-06-14T00:11:39+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.49.0", "version": "2.50.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee" "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/93d9db91c0235c486875d22f1e08b50bdf3e6eee", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
"reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee", "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2469,15 +2469,15 @@
{ {
"name": "Brian Nesbitt", "name": "Brian Nesbitt",
"email": "brian@nesbot.com", "email": "brian@nesbot.com",
"homepage": "http://nesbot.com" "homepage": "https://markido.com"
}, },
{ {
"name": "kylekatarnls", "name": "kylekatarnls",
"homepage": "http://github.com/kylekatarnls" "homepage": "https://github.com/kylekatarnls"
} }
], ],
"description": "An API extension for DateTime that supports 281 different languages.", "description": "An API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com", "homepage": "https://carbon.nesbot.com",
"keywords": [ "keywords": [
"date", "date",
"datetime", "datetime",
@ -2497,7 +2497,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-06-02T07:31:40+00:00" "time": "2021-06-28T22:38:45+00:00"
}, },
{ {
"name": "nunomaduro/collision", "name": "nunomaduro/collision",
@ -3781,16 +3781,16 @@
}, },
{ {
"name": "socialiteproviders/microsoft-azure", "name": "socialiteproviders/microsoft-azure",
"version": "4.2.0", "version": "4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/SocialiteProviders/Microsoft-Azure.git", "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
"reference": "7808764f777a01df88be9ca6b14d683e50aaf88a" "reference": "64779ec21db0bee3111039a67c0fa0ab550a3462"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7808764f777a01df88be9ca6b14d683e50aaf88a", "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/64779ec21db0bee3111039a67c0fa0ab550a3462",
"reference": "7808764f777a01df88be9ca6b14d683e50aaf88a", "reference": "64779ec21db0bee3111039a67c0fa0ab550a3462",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3816,9 +3816,9 @@
], ],
"description": "Microsoft Azure OAuth2 Provider for Laravel Socialite", "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",
"support": { "support": {
"source": "https://github.com/SocialiteProviders/Microsoft-Azure/tree/4.2.0" "source": "https://github.com/SocialiteProviders/Microsoft-Azure/tree/4.2.1"
}, },
"time": "2020-12-01T23:10:59+00:00" "time": "2021-06-14T22:51:38+00:00"
}, },
{ {
"name": "socialiteproviders/okta", "name": "socialiteproviders/okta",
@ -4072,16 +4072,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.4.25", "version": "v4.4.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "a62acecdf5b50e314a4f305cd01b5282126f3095" "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/a62acecdf5b50e314a4f305cd01b5282126f3095", "url": "https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
"reference": "a62acecdf5b50e314a4f305cd01b5282126f3095", "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4141,7 +4141,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces", "description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v4.4.25" "source": "https://github.com/symfony/console/tree/v4.4.26"
}, },
"funding": [ "funding": [
{ {
@ -4157,7 +4157,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-26T11:20:16+00:00" "time": "2021-06-06T09:12:27+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
@ -4362,16 +4362,16 @@
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v4.4.25", "version": "v4.4.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
"reference": "310a756cec00d29d89a08518405aded046a54a8b" "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/310a756cec00d29d89a08518405aded046a54a8b", "url": "https://api.github.com/repos/symfony/error-handler/zipball/4001f01153d0eb5496fe11d8c76d1e56b47fdb88",
"reference": "310a756cec00d29d89a08518405aded046a54a8b", "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4411,7 +4411,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code", "description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/error-handler/tree/v4.4.25" "source": "https://github.com/symfony/error-handler/tree/v4.4.26"
}, },
"funding": [ "funding": [
{ {
@ -4427,7 +4427,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-26T17:39:37+00:00" "time": "2021-06-24T07:57:22+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
@ -4732,16 +4732,16 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.25", "version": "v4.4.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "0c79d5a65ace4fe66e49702658c024a419d2438b" "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/0c79d5a65ace4fe66e49702658c024a419d2438b", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8759ed5c27c2a8a47cb60f367f4be6727f08d58b",
"reference": "0c79d5a65ace4fe66e49702658c024a419d2438b", "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4780,7 +4780,7 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-foundation/tree/v4.4.25" "source": "https://github.com/symfony/http-foundation/tree/v4.4.26"
}, },
"funding": [ "funding": [
{ {
@ -4796,20 +4796,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-26T11:20:16+00:00" "time": "2021-06-26T21:56:04+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.4.25", "version": "v4.4.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "3795165596fe81a52296b78c9aae938d434069cc" "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/3795165596fe81a52296b78c9aae938d434069cc", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e08b2fb8a6eedd81c70522e514bad9b2c1fff881",
"reference": "3795165596fe81a52296b78c9aae938d434069cc", "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4884,7 +4884,7 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-kernel/tree/v4.4.25" "source": "https://github.com/symfony/http-kernel/tree/v4.4.26"
}, },
"funding": [ "funding": [
{ {
@ -4900,20 +4900,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-06-01T07:12:08+00:00" "time": "2021-06-30T08:18:06+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v5.3.0", "version": "v5.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "ed710d297b181f6a7194d8172c9c2423d58e4852" "reference": "47dd7912152b82d0d4c8d9040dbc93d6232d472a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/ed710d297b181f6a7194d8172c9c2423d58e4852", "url": "https://api.github.com/repos/symfony/mime/zipball/47dd7912152b82d0d4c8d9040dbc93d6232d472a",
"reference": "ed710d297b181f6a7194d8172c9c2423d58e4852", "reference": "47dd7912152b82d0d4c8d9040dbc93d6232d472a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4967,7 +4967,7 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
"source": "https://github.com/symfony/mime/tree/v5.3.0" "source": "https://github.com/symfony/mime/tree/v5.3.2"
}, },
"funding": [ "funding": [
{ {
@ -4983,7 +4983,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-26T17:43:10+00:00" "time": "2021-06-09T10:58:01+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -5635,16 +5635,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.4.25", "version": "v4.4.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "cd61e6dd273975c6625316de9d141ebd197f93c9" "reference": "7e812c84c3f2dba173d311de6e510edf701685a8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/cd61e6dd273975c6625316de9d141ebd197f93c9", "url": "https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8",
"reference": "cd61e6dd273975c6625316de9d141ebd197f93c9", "reference": "7e812c84c3f2dba173d311de6e510edf701685a8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5676,7 +5676,7 @@
"description": "Executes commands in sub-processes", "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/process/tree/v4.4.25" "source": "https://github.com/symfony/process/tree/v4.4.26"
}, },
"funding": [ "funding": [
{ {
@ -5692,7 +5692,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-26T11:20:16+00:00" "time": "2021-06-09T14:57:04+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
@ -5863,16 +5863,16 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.4.25", "version": "v4.4.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "dfe132c5c6d89f90ce7f961742cc532e9ca16dd4" "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/dfe132c5c6d89f90ce7f961742cc532e9ca16dd4", "url": "https://api.github.com/repos/symfony/translation/zipball/2f7fa60b8d10ca71c30dc46b0870143183a8f131",
"reference": "dfe132c5c6d89f90ce7f961742cc532e9ca16dd4", "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5931,7 +5931,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v4.4.25" "source": "https://github.com/symfony/translation/tree/v4.4.26"
}, },
"funding": [ "funding": [
{ {
@ -5947,7 +5947,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-26T17:39:37+00:00" "time": "2021-06-06T08:51:46+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
@ -6029,16 +6029,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.4.25", "version": "v4.4.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "31ea689a8e7d2410016b0d25fc15a1ba05a6e2e0" "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/31ea689a8e7d2410016b0d25fc15a1ba05a6e2e0", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a586efdf2aa832d05b9249e9115d24f6a2691160",
"reference": "31ea689a8e7d2410016b0d25fc15a1ba05a6e2e0", "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6098,7 +6098,7 @@
"dump" "dump"
], ],
"support": { "support": {
"source": "https://github.com/symfony/var-dumper/tree/v4.4.25" "source": "https://github.com/symfony/var-dumper/tree/v4.4.26"
}, },
"funding": [ "funding": [
{ {
@ -6114,7 +6114,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-27T09:48:32+00:00" "time": "2021-06-17T06:35:48+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@ -6250,16 +6250,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "barryvdh/laravel-debugbar", "name": "barryvdh/laravel-debugbar",
"version": "v3.6.1", "version": "v3.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git", "url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "f6f0f895a33cac801286a74355d146bb5384a5da" "reference": "70b89754913fd89fef16d0170a91dbc2a5cd633a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/f6f0f895a33cac801286a74355d146bb5384a5da", "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/70b89754913fd89fef16d0170a91dbc2a5cd633a",
"reference": "f6f0f895a33cac801286a74355d146bb5384a5da", "reference": "70b89754913fd89fef16d0170a91dbc2a5cd633a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6319,15 +6319,19 @@
], ],
"support": { "support": {
"issues": "https://github.com/barryvdh/laravel-debugbar/issues", "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.1" "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.2"
}, },
"funding": [ "funding": [
{
"url": "https://fruitcake.nl",
"type": "custom"
},
{ {
"url": "https://github.com/barryvdh", "url": "https://github.com/barryvdh",
"type": "github" "type": "github"
} }
], ],
"time": "2021-06-02T06:42:22+00:00" "time": "2021-06-14T14:29:26+00:00"
}, },
{ {
"name": "barryvdh/laravel-ide-helper", "name": "barryvdh/laravel-ide-helper",
@ -8161,16 +8165,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "9.5.5", "version": "9.5.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "89ff45ea9d70e35522fb6654a2ebc221158de276" "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89ff45ea9d70e35522fb6654a2ebc221158de276", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
"reference": "89ff45ea9d70e35522fb6654a2ebc221158de276", "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8200,7 +8204,7 @@
"sebastian/global-state": "^5.0.1", "sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3", "sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3", "sebastian/resource-operations": "^3.0.3",
"sebastian/type": "^2.3.2", "sebastian/type": "^2.3.4",
"sebastian/version": "^3.0.2" "sebastian/version": "^3.0.2"
}, },
"require-dev": { "require-dev": {
@ -8248,7 +8252,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.5" "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
}, },
"funding": [ "funding": [
{ {
@ -8260,7 +8264,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-06-05T04:49:07+00:00" "time": "2021-06-23T05:14:38+00:00"
}, },
{ {
"name": "react/promise", "name": "react/promise",
@ -9169,16 +9173,16 @@
}, },
{ {
"name": "sebastian/type", "name": "sebastian/type",
"version": "2.3.2", "version": "2.3.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/type.git", "url": "https://github.com/sebastianbergmann/type.git",
"reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1" "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0d1c587401514d17e8f9258a27e23527cb1b06c1", "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
"reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1", "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9213,7 +9217,7 @@
"homepage": "https://github.com/sebastianbergmann/type", "homepage": "https://github.com/sebastianbergmann/type",
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/type/issues", "issues": "https://github.com/sebastianbergmann/type/issues",
"source": "https://github.com/sebastianbergmann/type/tree/2.3.2" "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
}, },
"funding": [ "funding": [
{ {
@ -9221,7 +9225,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-06-04T13:02:07+00:00" "time": "2021-06-15T12:49:02+00:00"
}, },
{ {
"name": "sebastian/version", "name": "sebastian/version",
@ -9518,16 +9522,16 @@
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v5.3.0", "version": "v5.3.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "348116319d7fb7d1faa781d26a48922428013eb2" "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/348116319d7fb7d1faa781d26a48922428013eb2", "url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9",
"reference": "348116319d7fb7d1faa781d26a48922428013eb2", "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9560,7 +9564,7 @@
"description": "Provides basic utilities for the filesystem", "description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/filesystem/tree/v5.3.0" "source": "https://github.com/symfony/filesystem/tree/v5.3.3"
}, },
"funding": [ "funding": [
{ {
@ -9576,7 +9580,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-26T17:43:10+00:00" "time": "2021-06-30T07:27:52+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",

1
resources/lang/en/common.php
View File

@ -60,6 +60,7 @@ return [
'no_activity' => 'No activity to show', 'no_activity' => 'No activity to show',
'no_items' => 'No items available', 'no_items' => 'No items available',
'back_to_top' => 'Back to top', 'back_to_top' => 'Back to top',
'skip_to_main_content' => 'Skip to main content',
'toggle_details' => 'Toggle Details', 'toggle_details' => 'Toggle Details',
'toggle_thumbnails' => 'Toggle Thumbnails', 'toggle_thumbnails' => 'Toggle Thumbnails',
'details' => 'Details', 'details' => 'Details',

17
resources/sass/styles.scss
View File

@ -136,6 +136,23 @@ $btt-size: 40px;
} }
} }
.skip-to-content-link {
position: fixed;
top: -$-xxl;
left: 0;
background-color: #FFF;
z-index: 15;
border-radius: 0 4px 4px 0;
display: block;
box-shadow: $bs-dark;
font-weight: bold;
&:focus {
top: $-xl;
outline-offset: -10px;
outline: 2px dotted var(--color-primary);
}
}
.contained-search-box { .contained-search-box {
display: flex; display: flex;
height: 38px; height: 38px;

1
resources/views/base.blade.php
View File

@ -28,6 +28,7 @@
</head> </head>
<body class="@yield('body-class')"> <body class="@yield('body-class')">
@include('common.parts.skip-to-content')
@include('partials.notifications') @include('partials.notifications')
@include('common.header') @include('common.header')

1
resources/views/common/parts/skip-to-content.blade.php Normal file
View File

@ -0,0 +1 @@
<a class="px-m py-s skip-to-content-link" href="#main-content">{{ trans('common.skip_to_main_content') }}</a>

2
resources/views/errors/500.blade.php
View File

@ -5,7 +5,7 @@
<div class="container small py-xl"> <div class="container small py-xl">
<main class="card content-wrap auto-height"> <main class="card content-wrap auto-height">
<div class="body"> <div id="main-content" class="body">
<h3>{{ trans('errors.error_occurred') }}</h3> <h3>{{ trans('errors.error_occurred') }}</h3>
<h5 class="mb-m">{{ $message ?? 'An unknown error occurred' }}</h5> <h5 class="mb-m">{{ $message ?? 'An unknown error occurred' }}</h5>
<p><a href="{{ url('/') }}" class="button outline">{{ trans('errors.return_home') }}</a></p> <p><a href="{{ url('/') }}" class="button outline">{{ trans('errors.return_home') }}</a></p>

2
resources/views/pages/edit.blade.php
View File

@ -8,7 +8,7 @@
@section('content') @section('content')
<div class="flex-fill flex fill-height"> <div id="main-content" class="flex-fill flex fill-height">
<form action="{{ $page->getUrl() }}" autocomplete="off" data-page-id="{{ $page->id }}" method="POST" class="flex flex-fill"> <form action="{{ $page->getUrl() }}" autocomplete="off" data-page-id="{{ $page->id }}" method="POST" class="flex flex-fill">
{{ csrf_field() }} {{ csrf_field() }}

2
resources/views/simple-layout.blade.php
View File

@ -4,7 +4,7 @@
<div class="flex-fill flex"> <div class="flex-fill flex">
<div class="content flex"> <div class="content flex">
<div class="scroll-body"> <div id="main-content" class="scroll-body">
@yield('body') @yield('body')
</div> </div>
</div> </div>

2
resources/views/tri-layout.blade.php
View File

@ -34,7 +34,7 @@
</div> </div>
<div class="@yield('body-wrap-classes') tri-layout-middle"> <div class="@yield('body-wrap-classes') tri-layout-middle">
<div class="tri-layout-middle-contents"> <div id="main-content" class="tri-layout-middle-contents">
@yield('body') @yield('body')
</div> </div>
</div> </div>

7
resources/views/users/edit.blade.php
View File

@ -74,8 +74,11 @@
<div role="presentation">@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])</div> <div role="presentation">@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])</div>
<div> <div>
@if($user->hasSocialAccount($driver)) @if($user->hasSocialAccount($driver))
<a href="{{ url("/login/service/{$driver}/detach") }}" aria-label="{{ trans('settings.users_social_disconnect') }} - {{ $driver }}" <form action="{{ url("/login/service/{$driver}/detach") }}" method="POST">
class="button small outline">{{ trans('settings.users_social_disconnect') }}</a> {{ csrf_field() }}
<button aria-label="{{ trans('settings.users_social_disconnect') }} - {{ $driver }}"
class="button small outline">{{ trans('settings.users_social_disconnect') }}</button>
</form>
@else @else
<a href="{{ url("/login/service/{$driver}") }}" aria-label="{{ trans('settings.users_social_connect') }} - {{ $driver }}" <a href="{{ url("/login/service/{$driver}") }}" aria-label="{{ trans('settings.users_social_connect') }} - {{ $driver }}"
class="button small outline">{{ trans('settings.users_social_connect') }}</a> class="button small outline">{{ trans('settings.users_social_connect') }}</a>

2
routes/web.php
View File

@ -226,7 +226,7 @@ Route::group(['middleware' => 'auth'], function () {
Route::get('/login/service/{socialDriver}', 'Auth\SocialController@login'); Route::get('/login/service/{socialDriver}', 'Auth\SocialController@login');
Route::get('/login/service/{socialDriver}/callback', 'Auth\SocialController@callback'); Route::get('/login/service/{socialDriver}/callback', 'Auth\SocialController@callback');
Route::group(['middleware' => 'auth'], function () { Route::group(['middleware' => 'auth'], function () {
Route::get('/login/service/{socialDriver}/detach', 'Auth\SocialController@detach'); Route::post('/login/service/{socialDriver}/detach', 'Auth\SocialController@detach');
}); });
Route::get('/register/service/{socialDriver}', 'Auth\SocialController@register'); Route::get('/register/service/{socialDriver}', 'Auth\SocialController@register');

26
tests/Auth/SocialAuthTest.php
View File

@ -1,5 +1,6 @@
<?php namespace Tests\Auth; <?php namespace Tests\Auth;
use BookStack\Auth\SocialAccount;
use BookStack\Auth\User; use BookStack\Auth\User;
use DB; use DB;
use Laravel\Socialite\Contracts\Factory; use Laravel\Socialite\Contracts\Factory;
@ -83,6 +84,31 @@ class SocialAuthTest extends TestCase
$resp->assertDontSee("login-form"); $resp->assertDontSee("login-form");
} }
public function test_social_account_detach()
{
$editor = $this->getEditor();
config([
'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',
'APP_URL' => 'http://localhost'
]);
$socialAccount = SocialAccount::query()->forceCreate([
'user_id' => $editor->id,
'driver' => 'github',
'driver_id' => 'logintest123',
]);
$resp = $this->actingAs($editor)->get($editor->getEditUrl());
$resp->assertElementContains('form[action$="/login/service/github/detach"]', 'Disconnect Account');
$resp = $this->post('/login/service/github/detach');
$resp->assertRedirect($editor->getEditUrl());
$resp = $this->followRedirects($resp);
$resp->assertSee('Github account was successfully disconnected from your profile.');
$this->assertDatabaseMissing('social_accounts', ['id' => $socialAccount->id]);
}
public function test_social_autoregister() public function test_social_autoregister()
{ {
config([ config([