diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index d8bb296fc..3a2dd2190 100644
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -44,5 +44,4 @@ class Localization
return $next($request);
}
-
}
diff --git a/app/Util/LanguageManager.php b/app/Util/LanguageManager.php
index ff860c83d..c33c73ad5 100644
--- a/app/Util/LanguageManager.php
+++ b/app/Util/LanguageManager.php
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
class LanguageManager
{
/**
- * Array of right-to-left language options
+ * Array of right-to-left language options.
*/
protected array $rtlLanguages = ['ar', 'fa', 'he'];
@@ -15,7 +15,7 @@ class LanguageManager
* Map of BookStack language names to best-estimate ISO and windows locale names.
* Locales can often be found by running `locale -a` on a linux system.
* Windows locales can be found at:
- * https://docs.microsoft.com/en-us/cpp/c-runtime-library/language-strings?view=msvc-170
+ * https://docs.microsoft.com/en-us/cpp/c-runtime-library/language-strings?view=msvc-170.
*
* @var array<string, array{iso: string, windows: string}>
*/
@@ -121,10 +121,10 @@ class LanguageManager
$isoLang ? $isoLang . '.utf8' : false,
$isoLang ?: false,
$isoLang ? str_replace('_', '-', $isoLang) : false,
- $this->localeMap[$language]['windows'] ?? false,
+ $this->localeMap[$language]['windows'] ?? false,
$language,
]);
setlocale(LC_TIME, ...$locales);
}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index f869d997a..6f9ed25cc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -58,16 +58,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.234.4",
+ "version": "3.235.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "8d56ddb99632200273bb933cbf82b758ab9cde2a"
+ "reference": "2025db05c7dd22ae414857dadd49207f64c2fc74"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8d56ddb99632200273bb933cbf82b758ab9cde2a",
- "reference": "8d56ddb99632200273bb933cbf82b758ab9cde2a",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2025db05c7dd22ae414857dadd49207f64c2fc74",
+ "reference": "2025db05c7dd22ae414857dadd49207f64c2fc74",
"shasum": ""
},
"require": {
@@ -144,9 +144,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.234.4"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.235.1"
},
- "time": "2022-08-26T18:20:48+00:00"
+ "time": "2022-09-02T18:18:19+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -559,16 +559,16 @@
},
{
"name": "doctrine/dbal",
- "version": "3.4.2",
+ "version": "3.4.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "22de295f10edbe00df74f517612f1fbd711131e2"
+ "reference": "a24b89d663d8f261199bc0a91c48016042ebda85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/22de295f10edbe00df74f517612f1fbd711131e2",
- "reference": "22de295f10edbe00df74f517612f1fbd711131e2",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/a24b89d663d8f261199bc0a91c48016042ebda85",
+ "reference": "a24b89d663d8f261199bc0a91c48016042ebda85",
"shasum": ""
},
"require": {
@@ -581,8 +581,8 @@
"psr/log": "^1|^2|^3"
},
"require-dev": {
- "doctrine/coding-standard": "9.0.0",
- "jetbrains/phpstorm-stubs": "2022.1",
+ "doctrine/coding-standard": "10.0.0",
+ "jetbrains/phpstorm-stubs": "2022.2",
"phpstan/phpstan": "1.8.2",
"phpstan/phpstan-strict-rules": "^1.3",
"phpunit/phpunit": "9.5.21",
@@ -650,7 +650,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.4.2"
+ "source": "https://github.com/doctrine/dbal/tree/3.4.3"
},
"funding": [
{
@@ -666,7 +666,7 @@
"type": "tidelift"
}
],
- "time": "2022-08-21T14:21:06+00:00"
+ "time": "2022-08-28T17:26:36+00:00"
},
{
"name": "doctrine/deprecations",
@@ -1965,25 +1965,26 @@
},
{
"name": "laravel/serializable-closure",
- "version": "v1.2.0",
+ "version": "v1.2.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
- "reference": "09f0e9fb61829f628205b7c94906c28740ff9540"
+ "reference": "d78fd36ba031a1a695ea5a406f29996948d7011b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540",
- "reference": "09f0e9fb61829f628205b7c94906c28740ff9540",
+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/d78fd36ba031a1a695ea5a406f29996948d7011b",
+ "reference": "d78fd36ba031a1a695ea5a406f29996948d7011b",
"shasum": ""
},
"require": {
"php": "^7.3|^8.0"
},
"require-dev": {
- "pestphp/pest": "^1.18",
- "phpstan/phpstan": "^0.12.98",
- "symfony/var-dumper": "^5.3"
+ "nesbot/carbon": "^2.61",
+ "pestphp/pest": "^1.21.3",
+ "phpstan/phpstan": "^1.8.2",
+ "symfony/var-dumper": "^5.4.11"
},
"type": "library",
"extra": {
@@ -2020,7 +2021,7 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
- "time": "2022-05-16T17:09:47+00:00"
+ "time": "2022-08-26T15:25:27+00:00"
},
{
"name": "laravel/socialite",
@@ -2997,16 +2998,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.62.0",
+ "version": "2.62.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "7507aec3d626797ce2123cf6c6556683be22b5f8"
+ "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7507aec3d626797ce2123cf6c6556683be22b5f8",
- "reference": "7507aec3d626797ce2123cf6c6556683be22b5f8",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a",
+ "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a",
"shasum": ""
},
"require": {
@@ -3095,20 +3096,20 @@
"type": "tidelift"
}
],
- "time": "2022-08-28T19:48:05+00:00"
+ "time": "2022-09-02T07:48:13+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.14.0",
+ "version": "v4.15.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+ "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
- "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+ "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
"shasum": ""
},
"require": {
@@ -3149,9 +3150,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
},
- "time": "2022-05-31T20:59:12+00:00"
+ "time": "2022-09-04T07:30:47+00:00"
},
{
"name": "onelogin/php-saml",
@@ -3558,16 +3559,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "3.0.14",
+ "version": "3.0.15",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef"
+ "reference": "c96e250238e88bf1040e9f7715efab1d6bc7f622"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
- "reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c96e250238e88bf1040e9f7715efab1d6bc7f622",
+ "reference": "c96e250238e88bf1040e9f7715efab1d6bc7f622",
"shasum": ""
},
"require": {
@@ -3579,6 +3580,7 @@
"phpunit/phpunit": "*"
},
"suggest": {
+ "ext-dom": "Install the DOM extension to load XML formatted public keys.",
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
"ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
@@ -3647,7 +3649,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
- "source": "https://github.com/phpseclib/phpseclib/tree/3.0.14"
+ "source": "https://github.com/phpseclib/phpseclib/tree/3.0.15"
},
"funding": [
{
@@ -3663,7 +3665,7 @@
"type": "tidelift"
}
],
- "time": "2022-04-04T05:15:45+00:00"
+ "time": "2022-09-02T17:05:08+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -4667,22 +4669,22 @@
},
{
"name": "socialiteproviders/manager",
- "version": "v4.1.0",
+ "version": "v4.2.0",
"source": {
"type": "git",
"url": "https://github.com/SocialiteProviders/Manager.git",
- "reference": "4e63afbd26dc45ff263591de2a0970436a6a0bf9"
+ "reference": "738276dfbc2b68a9145db7b3df1588d53db528a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/4e63afbd26dc45ff263591de2a0970436a6a0bf9",
- "reference": "4e63afbd26dc45ff263591de2a0970436a6a0bf9",
+ "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/738276dfbc2b68a9145db7b3df1588d53db528a1",
+ "reference": "738276dfbc2b68a9145db7b3df1588d53db528a1",
"shasum": ""
},
"require": {
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
- "laravel/socialite": "~4.0 || ~5.0",
- "php": "^7.2 || ^8.0"
+ "laravel/socialite": "~5.0",
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
"mockery/mockery": "^1.2",
@@ -4737,7 +4739,7 @@
"issues": "https://github.com/socialiteproviders/manager/issues",
"source": "https://github.com/socialiteproviders/manager"
},
- "time": "2022-01-23T22:40:23+00:00"
+ "time": "2022-09-02T10:20:10+00:00"
},
{
"name": "socialiteproviders/microsoft-azure",
@@ -8957,16 +8959,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.8.2",
+ "version": "1.8.4",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c"
+ "reference": "eed4c9da531f6ebb4787235b6fb486e2c20f34e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c53312ecc575caf07b0e90dee43883fdf90ca67c",
- "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/eed4c9da531f6ebb4787235b6fb486e2c20f34e5",
+ "reference": "eed4c9da531f6ebb4787235b6fb486e2c20f34e5",
"shasum": ""
},
"require": {
@@ -8990,9 +8992,13 @@
"MIT"
],
"description": "PHPStan - PHP Static Analysis Tool",
+ "keywords": [
+ "dev",
+ "static analysis"
+ ],
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/1.8.2"
+ "source": "https://github.com/phpstan/phpstan/tree/1.8.4"
},
"funding": [
{
@@ -9003,29 +9009,25 @@
"url": "https://github.com/phpstan",
"type": "github"
},
- {
- "url": "https://www.patreon.com/phpstan",
- "type": "patreon"
- },
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
- "time": "2022-07-20T09:57:31+00:00"
+ "time": "2022-09-03T13:08:04+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.16",
+ "version": "9.2.17",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
+ "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
- "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+ "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
"shasum": ""
},
"require": {
@@ -9081,7 +9083,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
},
"funding": [
{
@@ -9089,7 +9091,7 @@
"type": "github"
}
],
- "time": "2022-08-20T05:26:47+00:00"
+ "time": "2022-08-30T12:24:04+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -9334,16 +9336,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.23",
+ "version": "9.5.24",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "888556852e7e9bbeeedb9656afe46118765ade34"
+ "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34",
- "reference": "888556852e7e9bbeeedb9656afe46118765ade34",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+ "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
"shasum": ""
},
"require": {
@@ -9372,7 +9374,7 @@
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^3.0",
+ "sebastian/type": "^3.1",
"sebastian/version": "^3.0.2"
},
"suggest": {
@@ -9416,7 +9418,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
},
"funding": [
{
@@ -9428,7 +9430,7 @@
"type": "github"
}
],
- "time": "2022-08-22T14:01:36+00:00"
+ "time": "2022-08-30T07:42:16+00:00"
},
{
"name": "react/promise",
@@ -10536,16 +10538,16 @@
},
{
"name": "seld/phar-utils",
- "version": "1.2.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/phar-utils.git",
- "reference": "9f3452c93ff423469c0d56450431562ca423dcee"
+ "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee",
- "reference": "9f3452c93ff423469c0d56450431562ca423dcee",
+ "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
+ "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
"shasum": ""
},
"require": {
@@ -10578,9 +10580,9 @@
],
"support": {
"issues": "https://github.com/Seldaek/phar-utils/issues",
- "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0"
+ "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1"
},
- "time": "2021-12-10T11:20:11+00:00"
+ "time": "2022-08-31T10:31:18+00:00"
},
{
"name": "seld/signal-handler",
diff --git a/tests/Entity/PageRevisionTest.php b/tests/Entity/PageRevisionTest.php
index 01252eda9..5ddad8441 100644
--- a/tests/Entity/PageRevisionTest.php
+++ b/tests/Entity/PageRevisionTest.php
@@ -9,7 +9,6 @@ use Tests\TestCase;
class PageRevisionTest extends TestCase
{
-
public function test_revision_links_visible_to_viewer()
{
/** @var Page $page */