From ec6d5021e5a7153a2520d64c59b86b6f3c4157c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nico=20Hoffmann=20=20=E0=B7=B4=2E?= Date: Fri, 22 Nov 2024 14:25:03 +0100 Subject: [PATCH] Explicitly mark parameters as nullable (#340) --- src/claviska/SimpleImage.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/claviska/SimpleImage.php b/src/claviska/SimpleImage.php index c9c0c7b..5c08c58 100644 --- a/src/claviska/SimpleImage.php +++ b/src/claviska/SimpleImage.php @@ -331,7 +331,7 @@ public function fromString(string $string): SimpleImage|static * * @throws Exception Thrown when WEBP support is not enabled or unsupported format. */ - public function generate(string $mimeType = null, array|int $options = 100): array + public function generate(string|null $mimeType = null, array|int $options = 100): array { // Format defaults to the original mime type $mimeType = $mimeType ?: $this->mimeType; @@ -473,7 +473,7 @@ public function generate(string $mimeType = null, array|int $options = 100): arr * * @throws Exception */ - public function toDataUri(string $mimeType = null, array|int $options = 100): string + public function toDataUri(string|null $mimeType = null, array|int $options = 100): string { $image = $this->generate($mimeType, $options); @@ -490,7 +490,7 @@ public function toDataUri(string $mimeType = null, array|int $options = 100): st * * @throws Exception */ - public function toDownload(string $filename, string $mimeType = null, array|int $options = 100): static + public function toDownload(string $filename, string|null $mimeType = null, array|int $options = 100): static { $image = $this->generate($mimeType, $options); @@ -517,7 +517,7 @@ public function toDownload(string $filename, string $mimeType = null, array|int * * @throws Exception Thrown if failed write to file. */ - public function toFile(string $file, string $mimeType = null, array|int $options = 100): static + public function toFile(string $file, string|null $mimeType = null, array|int $options = 100): static { $image = $this->generate($mimeType, $options); @@ -538,7 +538,7 @@ public function toFile(string $file, string $mimeType = null, array|int $options * * @throws Exception */ - public function toScreen(string $mimeType = null, array|int $options = 100): static + public function toScreen(string|null $mimeType = null, array|int $options = 100): static { $image = $this->generate($mimeType, $options); @@ -557,7 +557,7 @@ public function toScreen(string $mimeType = null, array|int $options = 100): sta * * @throws Exception */ - public function toString(string $mimeType = null, array|int $options = 100): string + public function toString(string|null $mimeType = null, array|int $options = 100): string { return $this->generate($mimeType, $options)['data']; } @@ -975,7 +975,7 @@ public function overlay(string|SimpleImage $overlay, string $anchor = 'center', * @param int|null $height The new image height. * @return SimpleImage */ - public function resize(int $width = null, int $height = null): static + public function resize(int|null $width = null, int|null $height = null): static { // No dimensions specified if (! $width && ! $height) { @@ -1027,7 +1027,7 @@ public function resize(int $width = null, int $height = null): static * @param int|null $res_y The vertical resolution in DPI * @return SimpleImage */ - public function resolution(int $res_x, int $res_y = null): static + public function resolution(int $res_x, int|null $res_y = null): static { if (is_null($res_y)) { imageresolution($this->image, $res_x); @@ -1087,7 +1087,7 @@ public function rotate(int $angle, string|array $backgroundColor = 'transparent' * * @throws Exception */ - public function text(string $text, array $options, array &$boundary = null): static + public function text(string $text, array $options, array|null &$boundary = null): static { // Check for freetype support if (! function_exists('imagettftext')) { @@ -2196,7 +2196,7 @@ public static function darkenColor(string|array $color, int $amount): array * * @throws Exception Thrown if library \League\ColorExtractor is missing. */ - public function extractColors(int $count = 5, string|array $backgroundColor = null): array + public function extractColors(int $count = 5, string|array|null $backgroundColor = null): array { // Check for required library if (! class_exists('\\'.ColorExtractor::class)) {