WebSVN – lars-tiefland.laravel_shop – Diff – /trunk/vendor/nette/utils/src/Utils/Image.php

  * @method void stringUp($font, $x, $y, string $s, $col)
  * @method void trueColorToPalette(bool $dither, $ncolors)
  * @method array ttfText($size, $angle, $x, $y, $color, string $fontfile, string $text)
  * @property-read int $width
  * @property-read int $height
- * @property-read resource|\GdImage $imageResource
+ * @property-read \GdImage $imageResource
  */
 class Image
+{
 	use Nette\SmartObject;
-	/** {@link resize()} only shrinks images */
+	/** Prevent from getting resized to a bigger size than the original */
-	public const SHRINK_ONLY = 0b0001;
+	public const ShrinkOnly = 0b0001;
-	/** {@link resize()} will ignore aspect ratio */
+	/** Resizes to a specified width and height without keeping aspect ratio */
-	public const STRETCH = 0b0010;
+	public const Stretch = 0b0010;
-	/** {@link resize()} fits in given area so its dimensions are less than or equal to the required dimensions */
+	/** Resizes to fit into a specified width and height and preserves aspect ratio */
+	public const OrSmaller = 0b0000;
+	/** Resizes while bounding the smaller dimension to the specified width or height and preserves aspect ratio */
-	public const FIT = 0b0000;
+	public const OrBigger = 0b0100;
+	/** Resizes to the smallest possible size to completely cover specified width and height and reserves aspect ratio */
+	public const Cover = 0b1000;
+	/** @deprecated use Image::ShrinkOnly */
+	public const SHRINK_ONLY = self::ShrinkOnly;
+	/** @deprecated use Image::Stretch */
+	public const STRETCH = self::Stretch;
+	/** @deprecated use Image::OrSmaller */
+	public const FIT = self::OrSmaller;
+	/** @deprecated use Image::OrBigger */
+	public const FILL = self::OrBigger;
-	/** {@link resize()} fills given area so its dimensions are greater than or equal to the required dimensions */
+	/** @deprecated use Image::Cover */
-	public const FILL = 0b0100;
+	public const EXACT = self::Cover;
-	/** {@link resize()} fills given area exactly */
+	/** @deprecated use Image::EmptyGIF */
-	public const EXACT = 0b1000;
+	public const EMPTY_GIF = self::EmptyGIF;
 	/** image types */
 	public const
 		JPEG = IMAGETYPE_JPEG,
 		PNG = IMAGETYPE_PNG,
-		GIF = IMAGETYPE_GIF,
-		WEBP = IMAGETYPE_WEBP,
+		GIF = IMAGETYPE_GIF,
-		AVIF = 19, // IMAGETYPE_AVIF,
+		WEBP = IMAGETYPE_WEBP,
-		BMP = IMAGETYPE_BMP;
+		AVIF = 19, // IMAGETYPE_AVIF,
 		BMP = IMAGETYPE_BMP;
 	/**
 	 * Reads an image from a file and returns its type in $type.
 	 * @throws Nette\NotSupportedException if gd extension is not loaded
-	 * @throws UnknownImageFileException if file not found or file type is not known
-	 * @return static
+	 * @throws UnknownImageFileException if file not found or file type is not known
 	 */
-	public static function fromFile(string $file, ?int &$type = null)
+	public static function fromFile(string $file, ?int &$type = null): static
+	{
 		if (!extension_loaded('gd')) {
 			throw new Nette\NotSupportedException('PHP extension GD is not loaded.');
+	}
-	/**
-	 * Reads an image from a string and returns its type in $type.
+	/**
-	 * @return static
+	 * Reads an image from a string and returns its type in $type.
 	 * @throws Nette\NotSupportedException if gd extension is not loaded
 	 * @throws ImageException
 	 */
-	public static function fromString(string $s, ?int &$type = null)
+	public static function fromString(string $s, ?int &$type = null): static
+	{
 		if (!extension_loaded('gd')) {
 		return self::invokeSafe('imagecreatefromstring', $s, 'Unable to open image from string.', __METHOD__);
 	}
-	private static function invokeSafe(string $func, string $arg, string $message, string $callee): self
+	private static function invokeSafe(string $func, string $arg, string $message, string $callee): static
+	{
 		$errors = [];
+	}
-	/**
-	 * Creates a new true color image of the given dimensions. The default color is black.
+	/**
-	 * @return static
+	 * Creates a new true color image of the given dimensions. The default color is black.
 	 * @throws Nette\NotSupportedException if gd extension is not loaded
 	 */
-	public static function fromBlank(int $width, int $height, ?array $color = null)
+	public static function fromBlank(int $width, int $height, ?array $color = null): static
+	{
 		if (!extension_loaded('gd')) {
+	}
-	/**
-	 * Wraps GD image.
+	/**
-	 * @param  resource|\GdImage  $image
+	 * Wraps GD image.
 	 */
-	public function __construct($image)
+	public function __construct(\GdImage $image)
+	{
 		$this->setImageResource($image);
+	}
-	/**
-	 * Sets image resource.
-	 * @param  resource|\GdImage  $image
+	/**
-	 * @return static
+	 * Sets image resource.
 	 */
-	protected function setImageResource($image)
-	{
-		if (!$image instanceof \GdImage && !(is_resource($image) && get_resource_type($image) === 'gd')) {
-			throw new Nette\InvalidArgumentException('Image is not valid.');
 	protected function setImageResource(\GdImage $image): static
+	{
 		$this->image = $image;
 		return $this;
+	}
-	/**
-	 * Returns image GD resource.
+	/**
-	 * @return resource|\GdImage
+	 * Returns image GD resource.
 	 */
-	public function getImageResource()
+	public function getImageResource(): \GdImage
-	{
-		return $this->image;
+	{
-	}
+		return $this->image;
+	}
-	/**
 	 * Scales an image.
-	 * @param  int|string|null  $width in pixels or percent
+	/**
-	 * @param  int|string|null  $height in pixels or percent
+	 * Scales an image. Width and height accept pixels or percent.
-	 * @return static
+	 * @param  self::OrSmaller|self::OrBigger|self::Stretch|self::Cover|self::ShrinkOnly  $mode
 	 */
-	public function resize($width, $height, int $flags = self::FIT)
+	public function resize(int|string|null $width, int|string|null $height, int $mode = self::OrSmaller): static
+	{
-		if ($flags & self::EXACT) {
+		if ($mode & self::Cover) {
-			return $this->resize($width, $height, self::FILL)->crop('50%', '50%', $width, $height);
+			return $this->resize($width, $height, self::OrBigger)->crop('50%', '50%', $width, $height);
 ,
 ,
 				$newWidth,
 				$newHeight,
 				$this->getWidth(),
-				$this->getHeight()
+				$this->getHeight(),
 			);
 			$this->image = $newImage;
+		}
 		return $this;
+	}
-	/**
-	 * Calculates dimensions of resized image.
+	/**
-	 * @param  int|string|null  $newWidth in pixels or percent
+	 * Calculates dimensions of resized image. Width and height accept pixels or percent.
-	 * @param  int|string|null  $newHeight in pixels or percent
+	 * @param  self::OrSmaller|self::OrBigger|self::Stretch|self::Cover|self::ShrinkOnly  $mode
 	 */
 	public static function calculateSize(
 		int $srcWidth,
 		int $srcHeight,
 		$newWidth,
 		$newHeight,
-		int $flags = self::FIT
+		int $mode = self::OrSmaller,
 	): array
+	{
 		if ($newWidth === null) {
+		}
 		if ($newHeight === null) {
 		} elseif (self::isPercent($newHeight)) {
 			$newHeight = (int) round($srcHeight / 100 * abs($newHeight));
-			$flags |= empty($percents) ? 0 : self::STRETCH;
+			$mode |= empty($percents) ? 0 : self::Stretch;
 		} else {
 			$newHeight = abs($newHeight);
 		}
-		if ($flags & self::STRETCH) { // non-proportional
+		if ($mode & self::Stretch) { // non-proportional
 			if (!$newWidth || !$newHeight) {
 				throw new Nette\InvalidArgumentException('For stretching must be both width and height specified.');
 			}
-			if ($flags & self::SHRINK_ONLY) {
+			if ($mode & self::ShrinkOnly) {
-				$newWidth = (int) round($srcWidth * min(1, $newWidth / $srcWidth));
+				$newWidth = min($srcWidth, $newWidth);
-				$newHeight = (int) round($srcHeight * min(1, $newHeight / $srcHeight));
+				$newHeight = min($srcHeight, $newHeight);
+			}
 		} else {  // proportional
 			if ($newHeight > 0) { // fit height
 				$scale[] = $newHeight / $srcHeight;
 			}
-			if ($flags & self::FILL) {
+			if ($mode & self::OrBigger) {
 				$scale = [max($scale)];
+			}
-			if ($flags & self::SHRINK_ONLY) {
+			if ($mode & self::ShrinkOnly) {
 				$scale[] = 1;
 		return [max($newWidth, 1), max($newHeight, 1)];
+	}
-	/**
-	 * Crops image.
-	 * @param  int|string  $left in pixels or percent
-	 * @param  int|string  $top in pixels or percent
-	 * @param  int|string  $width in pixels or percent
-	 * @param  int|string  $height in pixels or percent
+	/**
-	 * @return static
+	 * Crops image. Arguments accepts pixels or percent.
 	 */
-	public function crop($left, $top, $width, $height)
+	public function crop(int|string $left, int|string $top, int|string $width, int|string $height): static
+	{
 		[$r['x'], $r['y'], $r['width'], $r['height']]
 			= static::calculateCutout($this->getWidth(), $this->getHeight(), $left, $top, $width, $height);
 		return $this;
+	}
-	/**
-	 * Calculates dimensions of cutout in image.
-	 * @param  int|string  $left in pixels or percent
-	 * @param  int|string  $top in pixels or percent
-	 * @param  int|string  $newWidth in pixels or percent
+	/**
-	 * @param  int|string  $newHeight in pixels or percent
+	 * Calculates dimensions of cutout in image. Arguments accepts pixels or percent.
+	 */
+	public static function calculateCutout(
+		int $srcWidth,
+		int $srcHeight,
+		int|string $left,
+		int|string $top,
+		int|string $newWidth,
-	 */
+		int|string $newHeight,
-	public static function calculateCutout(int $srcWidth, int $srcHeight, $left, $top, $newWidth, $newHeight): array
+	): array
+	{
 		if (self::isPercent($newWidth)) {
+	}
-	/**
-	 * Sharpens image a little bit.
+	/**
-	 * @return static
+	 * Sharpens image a little bit.
 	 */
-	public function sharpen()
+	public function sharpen(): static
+	{
 		imageconvolution($this->image, [ // my magic numbers ;)
 			[-1, -1, -1],
 		return $this;
+	}
-	/**
-	 * Puts another image into this image.
-	 * @param  int|string  $left in pixels or percent
+	/**
-	 * @param  int|string  $top in pixels or percent
-	 * @param  int  $opacity 0..100
+	 * Puts another image into this image. Left and top accepts pixels or percent.
-	 * @return static
+	 * @param  int  $opacity 0..100
 	 */
-	public function place(self $image, $left = 0, $top = 0, int $opacity = 100)
+	public function place(self $image, int|string $left = 0, int|string $top = 0, int $opacity = 100): static
+	{
 		$opacity = max(0, min(100, $opacity));
 		if ($opacity === 0) {
 			$left,
 			$top,
 ,
 ,
 			$width,
-			$height
+			$height,
 		);
 		return $this;
+	}
 	 * Saves image to the file. Quality is in the range 0..100 for JPEG (default 85), WEBP (default 80) and AVIF (default 30) and 0..9 for PNG (default 9).
 	 * @throws ImageException
 	 */
 	public function save(string $file, ?int $quality = null, ?int $type = null): void
+	{
-		$type = $type ?? self::extensionToType(pathinfo($file, PATHINFO_EXTENSION));
+		$type ??= self::extensionToType(pathinfo($file, PATHINFO_EXTENSION));
 		$this->output($type, $quality, $file);
+	}
 	/**
 	 * Outputs image to string. Quality is in the range 0..100 for JPEG (default 85), WEBP (default 80) and AVIF (default 30) and 0..9 for PNG (default 9).
 	 */
 	public function toString(int $type = self::JPEG, ?int $quality = null): string
+	{
-		return Helpers::capture(function () use ($type, $quality) {
+		return Helpers::capture(function () use ($type, $quality): void {
 			$this->output($type, $quality);
 		});
+	}
 	/**
-	 * Outputs image to string.
-	 */
+	 * Outputs image to string.
-	public function __toString(): string
-	{
-		try {
-			return $this->toString();
-		} catch (\Throwable $e) {
-			if (func_num_args() || PHP_VERSION_ID >= 70400) {
-				throw $e;
-			}
 	 */
-			trigger_error('Exception in ' . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
+	public function __toString(): string
 			return '';
+	}
-	/**
-	 * Call to undefined method.
+	/**
-	 * @return mixed
+	 * Call to undefined method.
 	 * @throws Nette\MemberAccessException
 	 */
-	public function __call(string $name, array $args)
+	public function __call(string $name, array $args): mixed
+	{
 		$function = 'image' . $name;
 		if (!function_exists($function)) {
 				$args[$key] = imagecolorallocatealpha(
 					$this->image,
 					$value['red'],
 					$value['green'],
 					$value['blue'],
-					$value['alpha']
+					$value['alpha'],
 				) ?: imagecolorresolvealpha(
 					$this->image,
 					$value['red'],
 					$value['green'],
 					$value['blue'],
-					$value['alpha']
+					$value['alpha'],
 				);
+			}
+		}
 		$res = $function($this->image, ...$args);
-		return $res instanceof \GdImage || (is_resource($res) && get_resource_type($res) === 'gd')
+		return $res instanceof \GdImage
 			? $this->setImageResource($res)
 			: $res;
 		imagepng($this->image, null, 0);
 		$this->setImageResource(imagecreatefromstring(ob_get_clean()));
+	}
-	/**
-	 * @param  int|string  $num in pixels or percent
 	 */
-	private static function isPercent(&$num): bool
+	private static function isPercent(int|string &$num): bool
+	{
-		if (is_string($num) && substr($num, -1) === '%') {
+		if (is_string($num) && str_ends_with($num, '%')) {
 			$num = (float) substr($num, 0, -1);
 			return true;
 		} elseif (is_int($num) || $num === (string) (int) $num) {

Subversion-Projekte lars-tiefland.laravel_shop

(root)/trunk/vendor/nette/utils/src/Utils/Image.php – Revision 150 → 399