From: Dan Brown <redacted>
Date: Sun, 5 Oct 2025 14:28:29 +0000 (+0100)
Subject: Merge branch 'v25-07' into development
X-Git-Tag: v25.11~1^2~15
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/146a6c01cc89a355b0d95af0ff22de64a42372b3

Merge branch 'v25-07' into development
---

146a6c01cc89a355b0d95af0ff22de64a42372b3
diff --cc composer.lock
index 1dbb75203,6b19f1c5c..e63062633
--- a/composer.lock
+++ b/composer.lock
@@@ -1739,20 -1739,20 +1739,20 @@@
          },
          {
              "name": "laravel/framework",
-             "version": "v12.26.4",
 -            "version": "v11.46.1",
++            "version": "v12.32.5",
              "source": {
                  "type": "git",
                  "url": "https://github.com/laravel/framework.git",
-                 "reference": "085a367a32ba86fcfa647bfc796098ae6f795b09"
 -                "reference": "5fd457f807570a962a53b403b1346efe4cc80bb8"
++                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/laravel/framework/zipball/085a367a32ba86fcfa647bfc796098ae6f795b09",
-                 "reference": "085a367a32ba86fcfa647bfc796098ae6f795b09",
 -                "url": "https://api.github.com/repos/laravel/framework/zipball/5fd457f807570a962a53b403b1346efe4cc80bb8",
 -                "reference": "5fd457f807570a962a53b403b1346efe4cc80bb8",
++                "url": "https://api.github.com/repos/laravel/framework/zipball/77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
++                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
                  "shasum": ""
              },
              "require": {
-                 "brick/math": "^0.11|^0.12|^0.13",
 -                "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12|^0.13|^0.14",
++                "brick/math": "^0.11|^0.12|^0.13|^0.14",
                  "composer-runtime-api": "^2.2",
                  "doctrine/inflector": "^2.0.5",
                  "dragonmantank/cron-expression": "^3.4",
@@@ -1826,6 -1824,6 +1826,7 @@@
                  "illuminate/filesystem": "self.version",
                  "illuminate/hashing": "self.version",
                  "illuminate/http": "self.version",
++                "illuminate/json-schema": "self.version",
                  "illuminate/log": "self.version",
                  "illuminate/macroable": "self.version",
                  "illuminate/mail": "self.version",
@@@ -1858,17 -1856,17 +1859,18 @@@
                  "league/flysystem-read-only": "^3.25.1",
                  "league/flysystem-sftp-v3": "^3.25.1",
                  "mockery/mockery": "^1.6.10",
-                 "orchestra/testbench-core": "^10.6.3",
 -                "orchestra/testbench-core": "^9.16.1",
 -                "pda/pheanstalk": "^5.0.6",
++                "opis/json-schema": "^2.4.1",
++                "orchestra/testbench-core": "^10.6.5",
 +                "pda/pheanstalk": "^5.0.6|^7.0.0",
                  "php-http/discovery": "^1.15",
                  "phpstan/phpstan": "^2.0",
 -                "phpunit/phpunit": "^10.5.35|^11.3.6|^12.0.1",
 -                "predis/predis": "^2.3",
 +                "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
 +                "predis/predis": "^2.3|^3.0",
                  "resend/resend-php": "^0.10.0",
 -                "symfony/cache": "^7.0.3",
 -                "symfony/http-client": "^7.0.3",
 -                "symfony/psr-http-message-bridge": "^7.0.3",
 -                "symfony/translation": "^7.0.3"
 +                "symfony/cache": "^7.2.0",
 +                "symfony/http-client": "^7.2.0",
 +                "symfony/psr-http-message-bridge": "^7.2.0",
 +                "symfony/translation": "^7.2.0"
              },
              "suggest": {
                  "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
@@@ -1883,7 -1881,7 +1885,7 @@@
                  "ext-pdo": "Required to use all database features.",
                  "ext-posix": "Required to use all features of the queue worker.",
                  "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
--                "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
++                "fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).",
                  "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
                  "laravel/tinker": "Required to use the tinker console command (^2.0).",
                  "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
@@@ -1952,7 -1950,7 +1954,7 @@@
                  "issues": "https://github.com/laravel/framework/issues",
                  "source": "https://github.com/laravel/framework"
              },
-             "time": "2025-08-29T14:15:53+00:00"
 -            "time": "2025-09-30T14:51:32+00:00"
++            "time": "2025-09-30T17:39:22+00:00"
          },
          {
              "name": "laravel/prompts",