Merge pull request #6388 from getkirby/release/4.2.0

4.2.0
getkirby · Apr 10, 2024 · c1e6ff7 · c1e6ff7
2 parents 6b7ac66 + ef877fd
commit c1e6ff7
Show file tree

Hide file tree

Showing 498 changed files with 7,307 additions and 2,665 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -99,7 +99,7 @@ jobs:
           extensions: ${{ env.extensions }}
           ini-values: ${{ env.ini }}
           coverage: pcov
-          tools: phpunit:10.5.5, psalm:5.15.0
+          tools: phpunit:10.5.5, psalm:5.20.0
 
       - name: Setup problem matchers
         run: |

diff --git a/bench/Filesystem/DirBench.php b/bench/Filesystem/DirBench.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Kirby\Filesystem;
+
+use Kirby\Cms\Page;
+
+class DirBench
+{
+	public function benchInventoryNoModels()
+	{
+		Dir::inventory(__DIR__ . '/fixtures/inventory/models');
+	}
+
+	public function benchInventoryOneModels()
+	{
+		Page::$models = [
+			'a' => 'A'
+		];
+
+		Dir::inventory(__DIR__ . '/fixtures/inventory/models');
+
+		Page::$models = [];
+	}
+
+	public function benchInventoryTwoModels()
+	{
+		Page::$models = [
+			'a' => 'A',
+			'b' => 'B'
+		];
+
+		Dir::inventory(__DIR__ . '/fixtures/inventory/models');
+
+		Page::$models = [];
+	}
+
+	public function benchInventoryFiveModels()
+	{
+		Page::$models = [
+			'a' => 'A',
+			'b' => 'B',
+			'c' => 'C',
+			'd' => 'D',
+			'e' => 'E'
+		];
+
+		Dir::inventory(__DIR__ . '/fixtures/inventory/models');
+
+		Page::$models = [];
+	}
+
+	public function benchInventory26Models()
+	{
+		Page::$models = [
+			'a' => 'A',
+			'b' => 'B',
+			'c' => 'C',
+			'd' => 'D',
+			'e' => 'E',
+			'f' => 'F',
+			'g' => 'G',
+			'h' => 'H',
+			'i' => 'I',
+			'j' => 'J',
+			'k' => 'K',
+			'l' => 'L',
+			'm' => 'M',
+			'n' => 'N',
+			'o' => 'O',
+			'p' => 'P',
+			'q' => 'Q',
+			'r' => 'R',
+			's' => 'S',
+			't' => 'T',
+			'u' => 'U',
+			'v' => 'V',
+			'w' => 'W',
+			'x' => 'X',
+			'y' => 'Y',
+			'z' => 'Z'
+		];
+
+		Dir::inventory(__DIR__ . '/fixtures/inventory/models');
+
+		Page::$models = [];
+	}
+}
diff --git a/bench/Filesystem/fixtures/inventory/models/a.txt b/bench/Filesystem/fixtures/inventory/models/a.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/a/a.txt b/bench/Filesystem/fixtures/inventory/models/a/a.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/a/bar.png b/bench/Filesystem/fixtures/inventory/models/a/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/a/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/a/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/a/foo.jpg b/bench/Filesystem/fixtures/inventory/models/a/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/a/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/a/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/b/b.txt b/bench/Filesystem/fixtures/inventory/models/b/b.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/b/bar.png b/bench/Filesystem/fixtures/inventory/models/b/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/b/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/b/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/b/foo.jpg b/bench/Filesystem/fixtures/inventory/models/b/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/b/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/b/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/bar.png b/bench/Filesystem/fixtures/inventory/models/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/c/bar.png b/bench/Filesystem/fixtures/inventory/models/c/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/c/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/c/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/c/c.txt b/bench/Filesystem/fixtures/inventory/models/c/c.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/c/foo.jpg b/bench/Filesystem/fixtures/inventory/models/c/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/c/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/c/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/d/bar.png b/bench/Filesystem/fixtures/inventory/models/d/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/d/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/d/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/d/d.txt b/bench/Filesystem/fixtures/inventory/models/d/d.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/d/foo.jpg b/bench/Filesystem/fixtures/inventory/models/d/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/d/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/d/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/e/bar.png b/bench/Filesystem/fixtures/inventory/models/e/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/e/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/e/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/e/e.txt b/bench/Filesystem/fixtures/inventory/models/e/e.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/e/foo.jpg b/bench/Filesystem/fixtures/inventory/models/e/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/e/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/e/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/f/bar.png b/bench/Filesystem/fixtures/inventory/models/f/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/f/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/f/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/f/f.txt b/bench/Filesystem/fixtures/inventory/models/f/f.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/f/foo.jpg b/bench/Filesystem/fixtures/inventory/models/f/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/f/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/f/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/foo.jpg b/bench/Filesystem/fixtures/inventory/models/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/g/bar.png b/bench/Filesystem/fixtures/inventory/models/g/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/g/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/g/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/g/foo.jpg b/bench/Filesystem/fixtures/inventory/models/g/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/g/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/g/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/g/g.txt b/bench/Filesystem/fixtures/inventory/models/g/g.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/h/bar.png b/bench/Filesystem/fixtures/inventory/models/h/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/h/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/h/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/h/foo.jpg b/bench/Filesystem/fixtures/inventory/models/h/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/h/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/h/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/h/h.txt b/bench/Filesystem/fixtures/inventory/models/h/h.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/i/bar.png b/bench/Filesystem/fixtures/inventory/models/i/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/i/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/i/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/i/foo.jpg b/bench/Filesystem/fixtures/inventory/models/i/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/i/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/i/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/i/i.txt b/bench/Filesystem/fixtures/inventory/models/i/i.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/j/bar.png b/bench/Filesystem/fixtures/inventory/models/j/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/j/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/j/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/j/foo.jpg b/bench/Filesystem/fixtures/inventory/models/j/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/j/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/j/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/j/j.txt b/bench/Filesystem/fixtures/inventory/models/j/j.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/k/bar.png b/bench/Filesystem/fixtures/inventory/models/k/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/k/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/k/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/k/foo.jpg b/bench/Filesystem/fixtures/inventory/models/k/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/k/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/k/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/k/k.txt b/bench/Filesystem/fixtures/inventory/models/k/k.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/l/bar.png b/bench/Filesystem/fixtures/inventory/models/l/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/l/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/l/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/l/foo.jpg b/bench/Filesystem/fixtures/inventory/models/l/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/l/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/l/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/l/l.txt b/bench/Filesystem/fixtures/inventory/models/l/l.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/m/bar.png b/bench/Filesystem/fixtures/inventory/models/m/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/m/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/m/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/m/foo.jpg b/bench/Filesystem/fixtures/inventory/models/m/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/m/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/m/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/m/m.txt b/bench/Filesystem/fixtures/inventory/models/m/m.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/n/bar.png b/bench/Filesystem/fixtures/inventory/models/n/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/n/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/n/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/n/foo.jpg b/bench/Filesystem/fixtures/inventory/models/n/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/n/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/n/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/n/n.txt b/bench/Filesystem/fixtures/inventory/models/n/n.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/o/bar.png b/bench/Filesystem/fixtures/inventory/models/o/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/o/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/o/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/o/foo.jpg b/bench/Filesystem/fixtures/inventory/models/o/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/o/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/o/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/o/o.txt b/bench/Filesystem/fixtures/inventory/models/o/o.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/p/bar.png b/bench/Filesystem/fixtures/inventory/models/p/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/p/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/p/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/p/foo.jpg b/bench/Filesystem/fixtures/inventory/models/p/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/p/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/p/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/p/p.txt b/bench/Filesystem/fixtures/inventory/models/p/p.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/q/bar.png b/bench/Filesystem/fixtures/inventory/models/q/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/q/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/q/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/q/foo.jpg b/bench/Filesystem/fixtures/inventory/models/q/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/q/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/q/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/q/q.txt b/bench/Filesystem/fixtures/inventory/models/q/q.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/r/bar.png b/bench/Filesystem/fixtures/inventory/models/r/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/r/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/r/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/r/foo.jpg b/bench/Filesystem/fixtures/inventory/models/r/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/r/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/r/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/r/r.txt b/bench/Filesystem/fixtures/inventory/models/r/r.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/s/bar.png b/bench/Filesystem/fixtures/inventory/models/s/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/s/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/s/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/s/foo.jpg b/bench/Filesystem/fixtures/inventory/models/s/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/s/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/s/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/s/s.txt b/bench/Filesystem/fixtures/inventory/models/s/s.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/t/bar.png b/bench/Filesystem/fixtures/inventory/models/t/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/t/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/t/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/t/foo.jpg b/bench/Filesystem/fixtures/inventory/models/t/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/t/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/t/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/t/t.txt b/bench/Filesystem/fixtures/inventory/models/t/t.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/u/bar.png b/bench/Filesystem/fixtures/inventory/models/u/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/u/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/u/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/u/foo.jpg b/bench/Filesystem/fixtures/inventory/models/u/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/u/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/u/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/u/u.txt b/bench/Filesystem/fixtures/inventory/models/u/u.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/v/bar.png b/bench/Filesystem/fixtures/inventory/models/v/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/v/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/v/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/v/foo.jpg b/bench/Filesystem/fixtures/inventory/models/v/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/v/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/v/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/v/v.txt b/bench/Filesystem/fixtures/inventory/models/v/v.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/w/bar.png b/bench/Filesystem/fixtures/inventory/models/w/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/w/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/w/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/w/foo.jpg b/bench/Filesystem/fixtures/inventory/models/w/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/w/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/w/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/w/w.txt b/bench/Filesystem/fixtures/inventory/models/w/w.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/x/bar.png b/bench/Filesystem/fixtures/inventory/models/x/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/x/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/x/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/x/foo.jpg b/bench/Filesystem/fixtures/inventory/models/x/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/x/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/x/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/x/x.txt b/bench/Filesystem/fixtures/inventory/models/x/x.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/y/bar.png b/bench/Filesystem/fixtures/inventory/models/y/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/y/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/y/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/y/foo.jpg b/bench/Filesystem/fixtures/inventory/models/y/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/y/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/y/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/y/y.txt b/bench/Filesystem/fixtures/inventory/models/y/y.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/z/bar.png b/bench/Filesystem/fixtures/inventory/models/z/bar.png
diff --git a/bench/Filesystem/fixtures/inventory/models/z/bar.png.txt b/bench/Filesystem/fixtures/inventory/models/z/bar.png.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/z/foo.jpg b/bench/Filesystem/fixtures/inventory/models/z/foo.jpg
diff --git a/bench/Filesystem/fixtures/inventory/models/z/foo.jpg.txt b/bench/Filesystem/fixtures/inventory/models/z/foo.jpg.txt
diff --git a/bench/Filesystem/fixtures/inventory/models/z/z.txt b/bench/Filesystem/fixtures/inventory/models/z/z.txt
diff --git a/cacert.pem b/cacert.pem
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Dec 12 04:12:04 2023 GMT
+## Certificate data from Mozilla as of: Mon Mar 11 15:25:27 2024 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 1970dd65858925d68498d2356aea6d03f764422523c5887deca8ce3ba9e1f845
+## SHA256: 4d96bd539f4719e9ace493757afbe4a23ee8579de1c97fbebc50bba3c12e8c1e
 ##
 
 
@@ -3532,3 +3532,50 @@ dVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670v64fG9PiO/yzcnMcmyiQ
 iRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17Org3bhzjlP1v9mxnhMUF6cKojawHhRUzN
 lM47ni3niAIi9G7oyOzWPPO5std3eqx7
 -----END CERTIFICATE-----
+
+Telekom Security TLS ECC Root 2020
+==================================
+-----BEGIN CERTIFICATE-----
+MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQswCQYDVQQGEwJE
+RTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMSswKQYDVQQDDCJUZWxl
+a29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIwMB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIz
+NTk1OVowYzELMAkGA1UEBhMCREUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkg
+R21iSDErMCkGA1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqG
+SM49AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/OtdKPD/M1
+2kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDPf8iAC8GXs7s1J8nCG6NC
+MEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6fMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMAoGCCqGSM49BAMDA2cAMGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZ
+Mo7k+5Dck2TOrbRBR2Diz6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdU
+ga/sf+Rn27iQ7t0l
+-----END CERTIFICATE-----
+
+Telekom Security TLS RSA Root 2023
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBjMQswCQYDVQQG
+EwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMSswKQYDVQQDDCJU
+ZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAyMDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMy
+NzIzNTk1OVowYzELMAkGA1UEBhMCREUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJp
+dHkgR21iSDErMCkGA1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9cUD/h3VC
+KSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHVcp6R+SPWcHu79ZvB7JPP
+GeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMAU6DksquDOFczJZSfvkgdmOGjup5czQRx
+UX11eKvzWarE4GC+j4NSuHUaQTXtvPM6Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWo
+l8hHD/BeEIvnHRz+sTugBTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9
+FIS3R/qy8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73Jco4v
+zLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg8qKrBC7m8kwOFjQg
+rIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8rFEz0ciD0cmfHdRHNCk+y7AO+oML
+KFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7S
+WWO/gLCMk3PLNaaZlSJhZQNg+y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUtqeXgj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2
+p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQpGv7qHBFfLp+
+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm9S3ul0A8Yute1hTWjOKWi0Fp
+kzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErwM807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy
+/SKE8YXJN3nptT+/XOR0so8RYgDdGGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4
+mZqTuXNnQkYRIer+CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtz
+aL1txKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+w6jv/naa
+oqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aKL4x35bcF7DvB7L6Gs4a8
+wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+ljX273CXE2whJdV/LItM3z7gLfEdxquVeE
+HVlNjM7IDiPCtyaaEBRx/pOyiriA8A4QntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0
+o82bNSQ3+pCTE4FCxpgmdTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
+-----END CERTIFICATE-----
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "4.1.2",
+	"version": "4.2.0",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -37,16 +37,16 @@
 		"ext-mbstring": "*",
 		"ext-openssl": "*",
 		"christian-riesen/base32": "1.6.0",
-		"claviska/simpleimage": "4.0.6",
+		"claviska/simpleimage": "4.1.0",
 		"composer/semver": "3.4.0",
 		"filp/whoops": "2.15.4",
 		"getkirby/composer-installer": "^1.2.1",
 		"laminas/laminas-escaper": "2.13.0",
 		"michelf/php-smartypants": "1.8.1",
 		"phpmailer/phpmailer": "6.9.1",
-		"symfony/polyfill-intl-idn": "1.28.0",
-		"symfony/polyfill-mbstring": "1.28.0",
-		"symfony/yaml": "6.4.0"
+		"symfony/polyfill-intl-idn": "1.29.0",
+		"symfony/polyfill-mbstring": "1.29.0",
+		"symfony/yaml": "6.4.3"
 	},
 	"replace": {
 		"symfony/polyfill-php72": "*"