Updated version and assets for release v26.05.1

Revert "Update german translation"

.forgejo/workflows/analyse-php.yml

@@ -22,7 +22,7 @@ jobs:
       uses: https://github.com/shivammathur/setup-php@v2
       with:
         php-version: 8.5
-        extensions: gd, mbstring, json, curl, xml, dom, mysql, ldap
+        extensions: gd, mbstring, json, curl, xml, mysql, ldap
 
     - name: Get Composer Cache Directory
       id: composer-cache

.forgejo/workflows/test-migrations.yml

@@ -23,14 +23,6 @@ jobs:
     services:
       mysql:
         image: docker.io/library/mariadb:12.2.2-noble
-        options: --tmpfs /var/lib/mysql:rw
-        cmd:
-          - --innodb-flush-log-at-trx-commit=0
-          - --innodb-flush-method=O_DIRECT
-          - --innodb-doublewrite=0
-          - --innodb-buffer-pool-size=256M
-          - --skip-log-bin
-          - --sync-binlog=0
         env:
           MARIADB_USER: bookstack-test
           MARIADB_PASSWORD: bookstack-test
@@ -43,7 +35,7 @@ jobs:
         uses: https://github.com/shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: gd, mbstring, json, curl, xml, dom, mysql, ldap
+          extensions: gd, mbstring, json, curl, xml, mysql, ldap
 
       - name: Get Composer Cache Directory
         id: composer-cache

.forgejo/workflows/test-php.yml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         php: ['8.2', '8.3', '8.4', '8.5']
     env:
-      phpextensions: gd, mbstring, json, curl, xml, dom, mysql, ldap, gmp
+      phpextensions: gd, mbstring, json, curl, xml, mysql, ldap, gmp
       phpextensioncachekey: cache-v1
     steps:
     - uses: https://code.forgejo.org/actions/checkout@v6

.gitignore

@@ -9,10 +9,10 @@ Homestead.yaml
 .idea
 npm-debug.log
 yarn-error.log
-/public/dist
+/public/dist/*.map
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/bower
 /public/build/
 /public/favicon.ico

app/Sorting/BookSortMapItem.php

@@ -4,12 +4,37 @@ namespace BookStack\Sorting;
 
 class BookSortMapItem
 {
-    public function __construct(
-        public int $id,
-        public int $sort,
-        public int|null $parentChapterId,
-        public string $type,
-        public int $parentBookId,
-    ) {
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var int
+     */
+    public $sort;
+
+    /**
+     * @var ?int
+     */
+    public $parentChapterId;
+
+    /**
+     * @var string
+     */
+    public $type;
+
+    /**
+     * @var int
+     */
+    public $parentBookId;
+
+    public function __construct(int $id, int $sort, ?int $parentChapterId, string $type, int $parentBookId)
+    {
+        $this->id = $id;
+        $this->sort = $sort;
+        $this->parentChapterId = $parentChapterId;
+        $this->type = $type;
+        $this->parentBookId = $parentBookId;
     }
 }

app/Sorting/BookSorter.php

@@ -168,7 +168,7 @@ class BookSorter
             $model->priority = $sortMapItem->sort;
         }
 
-        if ($priorityChanged || $chapterChanged) {
+        if ($chapterChanged || $priorityChanged) {
             $model::withoutTimestamps(fn () => $model->save());
         }
     }

app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php

@@ -38,6 +38,7 @@ class ConfiguredHtmlPurifier
             $this->configureHtmlDefinition($htmlDef);
         }
 
+        /** @var \HTMLPurifier_URIDefinition $uriDef */
         $uriDef = $config->getDefinition('URI', true, true);
         if ($uriDef instanceof HTMLPurifier_URIDefinition) {
             $this->configureUriDefinition($uriDef);

dev/checksums/vendor

@@ -1 +1 @@
-22e02ee72d21ff719c1073abbec8302f8e2096ba6d072e133051064ed24b45b1
+6d63a835dedf1b2052ca5ca38f2b00f393548763f15c28c8ba18c0fabc1e0299

version

@@ -1 +1 @@
-v26.05-dev
+v26.05.1