Merge pull request #9 from timnarr/fix-support-php-8-4

fix: support PHP 8.4

Author: timnarr

classes/Imagex.php

@@ -76,7 +76,7 @@ private function getFormats(): array
 	 * @param File|null $image Optional file object to determine format; defaults to main image.
 	 * @return string The image file format.
 	 */
-	private function getImageFormat(File $image = null): string
+	private function getImageFormat(File|null $image = null): string
 	{
 		$image = $image ?? $this->image;
 
@@ -123,7 +123,7 @@ private function getSrcsetPresetFromConfig(): array
 	 * @param File|null $image Optional file object; defaults to main image.
 	 * @return array Srcset preset with dynamic heights.
 	 */
-	private function getDynamicSrcsetPreset(string $ratio = null, File $image = null): array
+	private function getDynamicSrcsetPreset(string|null $ratio = null, File|null $image = null): array
 	{
 		$srcsetPreset = $this->getSrcsetPresetFromConfig();
 		['x' => $ratioX, 'y' => $ratioY] = getAspectRatio($ratio ?? $this->ratio, $image ?? $this->image);
@@ -148,7 +148,7 @@ private function getDynamicSrcsetPreset(string $ratio = null, File $image = null
 	 * @param File|null $image Optional file object; defaults to main image.
 	 * @return string Srcset value string.
 	 */
-	private function getSrcsetValue(array $srcsetPreset, File $image = null): string
+	private function getSrcsetValue(array $srcsetPreset, File|null $image = null): string
 	{
 		$image = $image ?? $this->image;
 

composer.json

@@ -21,7 +21,7 @@
 		}
 	],
 	"require": {
-		"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+		"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
 		"getkirby/composer-installer": "^1.2"
 	},
 	"require-dev": {

helpers/misc.php

@@ -24,7 +24,7 @@ function normalizeFormat(string $format): string
  * @param string|null $siteUrl Optionally override the default site URL.
  * @return string The URL, potentially converted to a relative path.
  */
-function urlHandler(string $url, bool $useRelativeUrls = null, string $siteUrl = null): string
+function urlHandler(string $url, bool|null $useRelativeUrls = null, string|null $siteUrl = null): string
 {
 	$useRelativeUrls = $useRelativeUrls ?? kirby()->option('timnarr.imagex.relativeUrls');
 	$siteUrl = $siteUrl ?? site()->url();