NOW MANAGED ON CODEBERG
Deps: Updated PHP package versions
Dan Brown2de3247ae485
diff --git a/app/Access/Mfa/TotpService.php b/app/Access/Mfa/TotpService.phpindex 1d1af451a..f13637a3f 100644--- a/app/Access/Mfa/TotpService.php+++ b/app/Access/Mfa/TotpService.php@@ -14,10 +14,9 @@ use PragmaRX\Google2FA\Support\Constants;class TotpService{- protected $google2fa;-- public function __construct(Google2FA $google2fa)- {+ public function __construct(+ protected Google2FA $google2fa+ ) {$this->google2fa = $google2fa;// Use SHA1 as a default, Personal testing of other options in 2021 found// many apps lack support for other algorithms yet still will scan@@ -35,7 +34,7 @@ class TotpService}/**- * Generate a TOTP URL from secret key.+ * Generate a TOTP URL from a secret key.*/public function generateUrl(string $secret, User $user): string{diff --git a/composer.json b/composer.jsonindex 7e7412976..9d47f5548 100644--- a/composer.json+++ b/composer.json@@ -31,7 +31,7 @@"league/oauth2-client": "^2.6","onelogin/php-saml": "^4.3.1","phpseclib/phpseclib": "^3.0",- "pragmarx/google2fa": "^8.0",+ "pragmarx/google2fa": "^9.0","predis/predis": "^3.2","socialiteproviders/discord": "^4.1","socialiteproviders/gitlab": "^4.1",@@ -47,7 +47,7 @@"nunomaduro/collision": "^8.6","larastan/larastan": "^v3.0","phpunit/phpunit": "^11.5",- "squizlabs/php_codesniffer": "^3.7",+ "squizlabs/php_codesniffer": "^4.0.1","ssddanbrown/asserthtml": "^3.1"},"autoload": {diff --git a/composer.lock b/composer.lockindex 98f2d4606..cd4ba68c5 100644--- a/composer.lock+++ b/composer.lock@@ -4,7 +4,7 @@"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies","This file is @generated automatically"],- "content-hash": "9f946fb1755acd72dcc63d0c3af637e9",+ "content-hash": "556613432c8fb7d8f96bcf637c8c07a9","packages": [{"name": "aws/aws-crt-php",@@ -62,16 +62,16 @@},{"name": "aws/aws-sdk-php",- "version": "3.366.4",+ "version": "3.368.2","source": {"type": "git","url": "https://github.com/aws/aws-sdk-php.git",- "reference": "1861cc8eede21cdaab0732fd44f43f19ddf1effd"+ "reference": "96397db9a3fd0b5e6b3c52e363b6a55831a93b1d"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1861cc8eede21cdaab0732fd44f43f19ddf1effd",- "reference": "1861cc8eede21cdaab0732fd44f43f19ddf1effd",+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/96397db9a3fd0b5e6b3c52e363b6a55831a93b1d",+ "reference": "96397db9a3fd0b5e6b3c52e363b6a55831a93b1d","shasum": ""},"require": {@@ -153,9 +153,9 @@"support": {"forum": "https://github.com/aws/aws-sdk-php/discussions","issues": "https://github.com/aws/aws-sdk-php/issues",- "source": "https://github.com/aws/aws-sdk-php/tree/3.366.4"+ "source": "https://github.com/aws/aws-sdk-php/tree/3.368.2"},- "time": "2025-12-09T19:21:22+00:00"+ "time": "2025-12-18T19:07:30+00:00"},{"name": "bacon/bacon-qr-code",@@ -1739,16 +1739,16 @@},{"name": "laravel/framework",- "version": "v12.42.0",+ "version": "v12.43.1","source": {"type": "git","url": "https://github.com/laravel/framework.git",- "reference": "509b33095564c5165366d81bbaa0afaac28abe75"+ "reference": "195b893593a9298edee177c0844132ebaa02102f"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/framework/zipball/509b33095564c5165366d81bbaa0afaac28abe75",- "reference": "509b33095564c5165366d81bbaa0afaac28abe75",+ "url": "https://api.github.com/repos/laravel/framework/zipball/195b893593a9298edee177c0844132ebaa02102f",+ "reference": "195b893593a9298edee177c0844132ebaa02102f","shasum": ""},"require": {@@ -1957,7 +1957,7 @@"issues": "https://github.com/laravel/framework/issues","source": "https://github.com/laravel/framework"},- "time": "2025-12-09T15:51:23+00:00"+ "time": "2025-12-16T18:53:08+00:00"},{"name": "laravel/prompts",@@ -3961,16 +3961,16 @@},{"name": "phpseclib/phpseclib",- "version": "3.0.47",+ "version": "3.0.48","source": {"type": "git","url": "https://github.com/phpseclib/phpseclib.git",- "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d"+ "reference": "64065a5679c50acb886e82c07aa139b0f757bb89"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9d6ca36a6c2dd434765b1071b2644a1c683b385d",- "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d",+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/64065a5679c50acb886e82c07aa139b0f757bb89",+ "reference": "64065a5679c50acb886e82c07aa139b0f757bb89","shasum": ""},"require": {@@ -4051,7 +4051,7 @@],"support": {"issues": "https://github.com/phpseclib/phpseclib/issues",- "source": "https://github.com/phpseclib/phpseclib/tree/3.0.47"+ "source": "https://github.com/phpseclib/phpseclib/tree/3.0.48"},"funding": [{@@ -4067,20 +4067,20 @@"type": "tidelift"}],- "time": "2025-10-06T01:07:24+00:00"+ "time": "2025-12-15T11:51:42+00:00"},{"name": "pragmarx/google2fa",- "version": "v8.0.3",+ "version": "v9.0.0","source": {"type": "git","url": "https://github.com/antonioribeiro/google2fa.git",- "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad"+ "reference": "e6bc62dd6ae83acc475f57912e27466019a1f2cf"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",- "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",+ "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/e6bc62dd6ae83acc475f57912e27466019a1f2cf",+ "reference": "e6bc62dd6ae83acc475f57912e27466019a1f2cf","shasum": ""},"require": {@@ -4117,9 +4117,9 @@],"support": {"issues": "https://github.com/antonioribeiro/google2fa/issues",- "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.3"+ "source": "https://github.com/antonioribeiro/google2fa/tree/v9.0.0"},- "time": "2024-09-05T11:56:40+00:00"+ "time": "2025-09-19T22:51:08+00:00"},{"name": "predis/predis",@@ -4598,16 +4598,16 @@},{"name": "psy/psysh",- "version": "v0.12.16",+ "version": "v0.12.18","source": {"type": "git","url": "https://github.com/bobthecow/psysh.git",- "reference": "ee6d5028be4774f56c6c2c85ec4e6bc9acfe6b67"+ "reference": "ddff0ac01beddc251786fe70367cd8bbdb258196"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ee6d5028be4774f56c6c2c85ec4e6bc9acfe6b67",- "reference": "ee6d5028be4774f56c6c2c85ec4e6bc9acfe6b67",+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ddff0ac01beddc251786fe70367cd8bbdb258196",+ "reference": "ddff0ac01beddc251786fe70367cd8bbdb258196","shasum": ""},"require": {@@ -4671,9 +4671,9 @@],"support": {"issues": "https://github.com/bobthecow/psysh/issues",- "source": "https://github.com/bobthecow/psysh/tree/v0.12.16"+ "source": "https://github.com/bobthecow/psysh/tree/v0.12.18"},- "time": "2025-12-07T03:39:01+00:00"+ "time": "2025-12-17T14:35:46+00:00"},{"name": "ralouphie/getallheaders",@@ -4797,20 +4797,20 @@},{"name": "ramsey/uuid",- "version": "4.9.1",+ "version": "4.9.2","source": {"type": "git","url": "https://github.com/ramsey/uuid.git",- "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"+ "reference": "8429c78ca35a09f27565311b98101e2826affde0"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",- "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/8429c78ca35a09f27565311b98101e2826affde0",+ "reference": "8429c78ca35a09f27565311b98101e2826affde0","shasum": ""},"require": {- "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",+ "brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14","php": "^8.0","ramsey/collection": "^1.2 || ^2.0"},@@ -4869,9 +4869,9 @@],"support": {"issues": "https://github.com/ramsey/uuid/issues",- "source": "https://github.com/ramsey/uuid/tree/4.9.1"+ "source": "https://github.com/ramsey/uuid/tree/4.9.2"},- "time": "2025-09-04T20:59:21+00:00"+ "time": "2025-12-14T04:43:48+00:00"},{"name": "robrichards/xmlseclibs",@@ -7922,23 +7922,23 @@},{"name": "tijsverkoyen/css-to-inline-styles",- "version": "v2.3.0",+ "version": "v2.4.0","source": {"type": "git","url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",- "reference": "0d72ac1c00084279c1816675284073c5a337c20d"+ "reference": "f0292ccf0ec75843d65027214426b6b163b48b41"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d",- "reference": "0d72ac1c00084279c1816675284073c5a337c20d",+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/f0292ccf0ec75843d65027214426b6b163b48b41",+ "reference": "f0292ccf0ec75843d65027214426b6b163b48b41","shasum": ""},"require": {"ext-dom": "*","ext-libxml": "*","php": "^7.4 || ^8.0",- "symfony/css-selector": "^5.4 || ^6.0 || ^7.0"+ "symfony/css-selector": "^5.4 || ^6.0 || ^7.0 || ^8.0"},"require-dev": {"phpstan/phpstan": "^2.0",@@ -7971,9 +7971,9 @@"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles","support": {"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",- "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0"+ "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.4.0"},- "time": "2024-12-21T16:25:41+00:00"+ "time": "2025-12-02T11:56:42+00:00"},{"name": "vlucas/phpdotenv",@@ -8439,16 +8439,16 @@},{"name": "larastan/larastan",- "version": "v3.8.0",+ "version": "v3.8.1","source": {"type": "git","url": "https://github.com/larastan/larastan.git",- "reference": "d13ef96d652d1b2a8f34f1760ba6bf5b9c98112e"+ "reference": "ff3725291bc4c7e6032b5a54776e3e5104c86db9"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/larastan/larastan/zipball/d13ef96d652d1b2a8f34f1760ba6bf5b9c98112e",- "reference": "d13ef96d652d1b2a8f34f1760ba6bf5b9c98112e",+ "url": "https://api.github.com/repos/larastan/larastan/zipball/ff3725291bc4c7e6032b5a54776e3e5104c86db9",+ "reference": "ff3725291bc4c7e6032b5a54776e3e5104c86db9","shasum": ""},"require": {@@ -8462,7 +8462,7 @@"illuminate/pipeline": "^11.44.2 || ^12.4.1","illuminate/support": "^11.44.2 || ^12.4.1","php": "^8.2",- "phpstan/phpstan": "^2.1.29"+ "phpstan/phpstan": "^2.1.32"},"require-dev": {"doctrine/coding-standard": "^13",@@ -8517,7 +8517,7 @@],"support": {"issues": "https://github.com/larastan/larastan/issues",- "source": "https://github.com/larastan/larastan/tree/v3.8.0"+ "source": "https://github.com/larastan/larastan/tree/v3.8.1"},"funding": [{@@ -8525,7 +8525,7 @@"type": "github"}],- "time": "2025-10-27T23:09:14+00:00"+ "time": "2025-12-11T16:37:35+00:00"},{"name": "mockery/mockery",@@ -10372,26 +10372,26 @@},{"name": "squizlabs/php_codesniffer",- "version": "3.13.5",+ "version": "4.0.1","source": {"type": "git","url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",- "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4"+ "reference": "0525c73950de35ded110cffafb9892946d7771b5"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4",- "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4",+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5",+ "reference": "0525c73950de35ded110cffafb9892946d7771b5","shasum": ""},"require": {"ext-simplexml": "*","ext-tokenizer": "*","ext-xmlwriter": "*",- "php": ">=5.4.0"+ "php": ">=7.2.0"},"require-dev": {- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"+ "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31"},"bin": ["bin/phpcbf",@@ -10416,7 +10416,7 @@"homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"}],- "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",+ "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.","homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer","keywords": ["phpcs",@@ -10447,7 +10447,7 @@"type": "thanks_dev"}],- "time": "2025-11-04T16:30:35+00:00"+ "time": "2025-11-10T16:43:36+00:00"},{"name": "ssddanbrown/asserthtml",diff --git a/tests/Activity/CommentSettingTest.php b/tests/Activity/CommentSettingTest.phpindex ad82d9b70..f8210114c 100644--- a/tests/Activity/CommentSettingTest.php+++ b/tests/Activity/CommentSettingTest.php@@ -1,6 +1,6 @@<?php-namespace Activity;+namespace Tests\Activity;use Tests\TestCase;diff --git a/tests/Activity/CommentStoreTest.php b/tests/Activity/CommentStoreTest.phpindex 1c9e5aa5f..2296f91a9 100644--- a/tests/Activity/CommentStoreTest.php+++ b/tests/Activity/CommentStoreTest.php@@ -1,6 +1,6 @@<?php-namespace Activity;+namespace Tests\Activity;use BookStack\Activity\ActivityType;use BookStack\Activity\Models\Comment;diff --git a/tests/Settings/PageListLimitsTest.php b/tests/Settings/PageListLimitsTest.phpindex b307b9355..0d3dea3e1 100644--- a/tests/Settings/PageListLimitsTest.php+++ b/tests/Settings/PageListLimitsTest.php@@ -1,6 +1,6 @@<?php-namespace Settings;+namespace Tests\Settings;use BookStack\Entities\Models\Book;use BookStack\Entities\Models\Bookshelf;