feat: PHP 8.5 support

distantnative · distantnative · commit 24700c642437 · 2025-11-19T15:50:11.000+01:00
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -57,7 +57,7 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        php: ["8.2", "8.3", "8.4"]
+        php: ["8.2", "8.3", "8.4", "8.5"]
     env:
       extensions: mbstring, ctype, curl, gd, apcu, memcached, redis
       ini: apc.enabled=1, apc.enable_cli=1, pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
@@ -127,7 +127,7 @@ jobs:
         run: phpunit -c phpunit.ci.xml --coverage-clover ${{ github.workspace }}/clover.xml
 
       - name: Statically analyze using Psalm
-        if: always() && steps.finishPrepare.outcome == 'success' && matrix.php != '8.4'
+        if: always() && steps.finishPrepare.outcome == 'success' && matrix.php != '8.5'
         run: psalm --output-format=github --php-version=${{ matrix.php }} --report=sarif/psalm.sarif --report-show-info=false
 
       - name: Upload coverage results to Codecov
@@ -144,7 +144,7 @@ jobs:
           env_vars: PHP
 
       - name: Upload code scanning results to GitHub
-        if: always() && steps.finishPrepare.outcome == 'success' && github.repository == 'getkirby/kirby' && matrix.php != '8.4'
+        if: always() && steps.finishPrepare.outcome == 'success' && github.repository == 'getkirby/kirby' && matrix.php != '8.5'
         uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # pin@v3
         with:
           sarif_file: sarif
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
 		"source": "https://github.com/getkirby/kirby"
 	},
 	"require": {
-		"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+		"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
 		"ext-SimpleXML": "*",
 		"ext-ctype": "*",
 		"ext-curl": "*",
@@ -37,7 +37,7 @@
 		"ext-mbstring": "*",
 		"ext-openssl": "*",
 		"christian-riesen/base32": "1.6.0",
-		"claviska/simpleimage": "4.2.1",
+		"claviska/simpleimage": "4.3.0",
 		"composer/semver": "3.4.4",
 		"filp/whoops": "2.18.4",
 		"getkirby/composer-installer": "^1.2.1",
diff --git a/composer.lock b/composer.lock
diff --git a/dependencies/spyc/Spyc.php b/dependencies/spyc/Spyc.php
@@ -7,7 +7,7 @@
  * into a PHP array.  It currently supports a very limited subsection of
  * the YAML spec.
  *
- * @version 0.6.3 (Kirby fork for PHP 8.1+)
+ * @version 0.6.4 (Kirby fork for PHP 8.5+)
  * @author Vlad Andersen <vlad.andersen@gmail.com>
  * @author Chris Wanstrath <chris@ozmm.org>
  * @link https://github.com/mustangostang/spyc/
@@ -877,7 +877,7 @@ private function addArray($incoming_data, $incoming_indent)
             return $this->addArrayInline($incoming_data, $incoming_indent);
 
         $key = key($incoming_data);
-        $value = isset($incoming_data[$key]) ? $incoming_data[$key] : null;
+        $value = $key !== null && isset($incoming_data[$key]) ? $incoming_data[$key] : null;
         if ($key === '__!YAMLZero') $key = '0';
 
         if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values.
diff --git a/src/Cms/Email.php b/src/Cms/Email.php
@@ -213,7 +213,7 @@ protected function transformUserSingle(
 		$result = $this->transformModel($addressProp, User::class, 'name', 'email');
 
 		$address = array_keys($result)[0] ?? null;
-		$name    = $result[$address] ?? null;
+		$name    = $address !== null ? ($result[$address] ?? null) : null;
 
 		// if the array is non-associative, the value is the address
 		if (is_int($address) === true) {
diff --git a/src/Cms/PageActions.php b/src/Cms/PageActions.php
@@ -498,8 +498,14 @@ public function createChild(array $props): Page
 			'site'   => $this->site(),
 		];
 
-		$modelClass = static::$models[$props['template'] ?? null] ?? static::class;
-		return $modelClass::create($props);
+		if (
+			($template = $props['template'] ?? null) &&
+			($model = static::$models[$template] ?? null)
+		) {
+			return $model::create($props);
+		}
+
+		return static::create($props);
 	}
 
 	/**
diff --git a/src/Filesystem/Mime.php b/src/Filesystem/Mime.php
@@ -125,6 +125,10 @@ public static function fix(
 		string|null $mime = null,
 		string|null $extension = null
 	): string|null {
+		if ($mime === null || $extension === null) {
+			return $mime;
+		}
+
 		// fixing map
 		$map = [
 			'text/html' => [
diff --git a/src/Panel/Lab/Example.php b/src/Panel/Lab/Example.php
@@ -44,7 +44,7 @@ public function __construct(
 
 	public function collectTab(string|null $tab): string|null
 	{
-		if ($this->tabs === []) {
+		if ($this->tabs === [] || $tab === null) {
 			return null;
 		}
 
diff --git a/src/Panel/Panel.php b/src/Panel/Panel.php
@@ -321,7 +321,7 @@ public static function router(string|null $path = null): Response|null
 			$auth   = $route->attributes()['auth'] ?? true;
 			$areaId = $route->attributes()['area'] ?? null;
 			$type   = $route->attributes()['type'] ?? 'view';
-			$area   = $areas[$areaId] ?? null;
+			$area   = $areaId !== null ? ($areas[$areaId] ?? null) : null;
 
 			// call the route action to check the result
 			try {
diff --git a/src/Plugin/Plugin.php b/src/Plugin/Plugin.php
@@ -330,7 +330,7 @@ public function version(): string|null
 		try {
 			// try to get version from "vendor/composer/installed.php",
 			// this is the most reliable source for the version
-			$version = InstalledVersions::getPrettyVersion($name);
+			$version = $name !== null ? InstalledVersions::getPrettyVersion($name) : null;
 		} catch (Throwable) {
 			$version = null;
 		}
diff --git a/vendor/claviska/simpleimage/src/claviska/SimpleImage.php b/vendor/claviska/simpleimage/src/claviska/SimpleImage.php
@@ -193,20 +193,18 @@ public function fromDataUri(string $uri): static
         }
 
         // Determine mime type
-        $this->mimeType = $matches[1];
-        if (! preg_match('/^image\/(gif|jpeg|png)$/', $this->mimeType)) {
+        $mimeType = $matches[1];
+        if (! preg_match('/^image\/(gif|jpeg|png)$/', $mimeType)) {
             throw new Exception(
-                'Unsupported format: '.$this->mimeType,
+                'Unsupported format: ' . $mimeType,
                 self::ERR_UNSUPPORTED_FORMAT
             );
         }
 
         // Get image data
-        $uri = base64_decode(strval(preg_replace('/^data:(.*?);base64,/', '', $uri)));
-        $this->image = imagecreatefromstring($uri);
-        if (! $this->image) {
-            throw new Exception('Invalid image data.', self::ERR_INVALID_IMAGE);
-        }
+        $data = base64_decode(strval(preg_replace('/^data:(.*?);base64,/', '', $uri)));
+
+        $this->fromString($data, $mimeType);
 
         return $this;
     }
@@ -221,7 +219,7 @@ public function fromDataUri(string $uri): static
      */
     public function fromFile(string $file): static
     {
-    // Set fopen options.
+        // Set fopen options.
         $sslVerify = $this->getFlag('sslVerify'); // Don't perform peer validation when true
         $opts = [
             'ssl' => [
@@ -231,20 +229,40 @@ public function fromFile(string $file): static
         ];
 
         // Check if the file exists and is readable.
-        $file = @file_get_contents($file, false, stream_context_create($opts));
-        if ($file === false) {
+        $data = @file_get_contents($file, false, stream_context_create($opts));
+        if ($data === false) {
             throw new Exception("File not found: $file", self::ERR_FILE_NOT_FOUND);
         }
 
-        // Create image object from string
-        $this->image = imagecreatefromstring($file);
+        $this->fromString($data);
+
+        return $this;
+    }
+
+    /**
+     * Creates a new image from an image data string.
+     *
+     * @param string $data
+     * @param string|null $mimeType
+     * @return SimpleImage
+     * @throws Exception
+     */
+    public function fromString(string $data, ?string $mimeType = null): static
+    {
 
-        // Get image info
-        $info = @getimagesizefromstring($file);
-        if ($info === false) {
-            throw new Exception("Invalid image file: $file", self::ERR_INVALID_IMAGE);
+        if($mimeType === null) {
+            // Get image info
+            $info = @getimagesizefromstring($data);
+            if ($info === false) {
+                throw new Exception("Invalid image data", self::ERR_INVALID_IMAGE);
+            }
+            $this->mimeType = $info['mime'];
+        } else {
+            $this->mimeType = $mimeType;
         }
-        $this->mimeType = $info['mime'];
+
+        // Create image object from string
+        $this->image = imagecreatefromstring($data);
 
         if (! $this->image) {
             throw new Exception('Unsupported format: '.$this->mimeType, self::ERR_UNSUPPORTED_FORMAT);
@@ -268,12 +286,12 @@ public function fromFile(string $file): static
             case 'image/jpeg':
                 // Load exif data from JPEG images
                 if (function_exists('exif_read_data')) {
-                    $this->exif = @exif_read_data('data://image/jpeg;base64,'.base64_encode($file));
+                    $this->exif = @exif_read_data('data://image/jpeg;base64,'.base64_encode($data));
                 }
                 break;
         }
 
-        // Convert pallete images to true color images
+        // Convert palette images to true color images
         imagepalettetotruecolor($this->image);
 
         return $this;
@@ -302,21 +320,6 @@ public function fromNew(int $width, int $height, string|array $color = 'transpar
         return $this;
     }
 
-    /**
-     * Creates a new image from a string.
-     *
-     * @param  string  $string The raw image data as a string.
-     * @return SimpleImage
-     *
-     * @throws Exception
-     *
-     * @example
-     *    $string = file_get_contents('image.jpg');
-     */
-    public function fromString(string $string): SimpleImage|static
-    {
-        return $this->fromFile('data://;base64,'.base64_encode($string));
-    }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////
     // Savers
@@ -621,6 +624,28 @@ public function getMimeType(): string
         return $this->mimeType;
     }
 
+	/**
+	 * Gets the corresponding extension for the current MIME type
+	 *
+	 * @throws Exception Thrown if invalid MIME type found (edge case)
+	 */
+	public function getExtension(): string
+	{
+		return match (strtolower($this->mimeType)) {
+			'image/jpeg' => 'jpg',
+			'image/png' => 'png',
+			'image/gif' => 'gif',
+			'image/webp' => 'webp',
+			'image/avif' => 'avif',
+			'image/bmp', 'image/x-ms-bmp', 'image/x-windows-bmp' => 'bmp',
+			//other image types supported are WAP BMP and GD's internal pics
+			default => throw new \Exception(
+				'Unsupported format: '.$this->mimeType,
+				self::ERR_UNSUPPORTED_FORMAT
+			)
+		};
+	}
+
     /**
      * Gets the image's current orientation.
      *
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
@@ -53,6 +53,7 @@
     'Kirby\\Cms\\Collection' => $baseDir . '/src/Cms/Collection.php',
     'Kirby\\Cms\\Collections' => $baseDir . '/src/Cms/Collections.php',
     'Kirby\\Cms\\Core' => $baseDir . '/src/Cms/Core.php',
+    'Kirby\\Cms\\Cors' => $baseDir . '/src/Cms/Cors.php',
     'Kirby\\Cms\\Email' => $baseDir . '/src/Cms/Email.php',
     'Kirby\\Cms\\Event' => $baseDir . '/src/Cms/Event.php',
     'Kirby\\Cms\\Events' => $baseDir . '/src/Cms/Events.php',
@@ -368,6 +369,7 @@
     'Kirby\\Query\\Segments' => $baseDir . '/src/Query/Segments.php',
     'Kirby\\Query\\Visitors\\DefaultVisitor' => $baseDir . '/src/Query/Visitors/DefaultVisitor.php',
     'Kirby\\Query\\Visitors\\Visitor' => $baseDir . '/src/Query/Visitors/Visitor.php',
+    'Kirby\\Reflection\\Constructor' => $baseDir . '/src/Reflection/Constructor.php',
     'Kirby\\Sane\\DomHandler' => $baseDir . '/src/Sane/DomHandler.php',
     'Kirby\\Sane\\Handler' => $baseDir . '/src/Sane/Handler.php',
     'Kirby\\Sane\\Html' => $baseDir . '/src/Sane/Html.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(`
`44`	`44`
`45`	`45`	`public function collectTab(string\|null $tab): string\|null`
`46`	`46`	`{`
`47`		`- if ($this->tabs === []) {`
	`47`	`+ if ($this->tabs === [] \|\| $tab === null) {`
`48`	`48`	`return null;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ public function version(): string\|null`
`330`	`330`	`try {`
`331`	`331`	`// try to get version from "vendor/composer/installed.php",`
`332`	`332`	`// this is the most reliable source for the version`
`333`		`- $version = InstalledVersions::getPrettyVersion($name);`
	`333`	`+ $version = $name !== null ? InstalledVersions::getPrettyVersion($name) : null;`
`334`	`334`	`} catch (Throwable) {`
`335`	`335`	`$version = null;`
`336`	`336`	`}`