smiley 2 лет назад
Родитель
Сommit
c70f05b106
1 измененных файлов с 36 добавлено и 12 удалено
  1. 36 12
      src/QROptionsTrait.php

+ 36 - 12
src/QROptionsTrait.php

@@ -126,12 +126,6 @@ trait QROptionsTrait{
 	 */
 	 */
 	protected ?string $cachefile = null;
 	protected ?string $cachefile = null;
 
 
-	/**
-	 * @deprecated 5.0.0 use QROptions::$outputBase64 instead
-	 * @see        \chillerlan\QRCode\QROptions::$outputBase64
-	 */
-	protected bool $imageBase64 = true;
-
 	/**
 	/**
 	 * Toggle base64 data URI or raw data output (if applicable)
 	 * Toggle base64 data URI or raw data output (if applicable)
 	 */
 	 */
@@ -538,6 +532,16 @@ trait QROptionsTrait{
 		$this->circleRadius = max(0.1, min(0.75, $circleRadius));
 		$this->circleRadius = max(0.1, min(0.75, $circleRadius));
 	}
 	}
 
 
+	/*
+	 * redirect calls of deprecated variables to new/renamed property
+	 */
+
+	/**
+	 * @deprecated 5.0.0 use QROptions::$outputBase64 instead
+	 * @see        \chillerlan\QRCode\QROptions::$outputBase64
+	 */
+	protected bool $imageBase64;
+
 	/**
 	/**
 	 * redirect call to the new variable
 	 * redirect call to the new variable
 	 *
 	 *
@@ -560,9 +564,11 @@ trait QROptionsTrait{
 		return $this->outputBase64;
 		return $this->outputBase64;
 	}
 	}
 
 
-	/*
-	 * redirect calls of deprecated variables to new/renamed property
+	/**
+	 * @deprecated 5.0.0 use QROptions::$quality instead
+	 * @see        \chillerlan\QRCode\QROptions::$quality
 	 */
 	 */
+	protected int $jpegQuality;
 
 
 	/**
 	/**
 	 * @deprecated 5.0.0 use QROptions::$quality instead
 	 * @deprecated 5.0.0 use QROptions::$quality instead
@@ -582,6 +588,12 @@ trait QROptionsTrait{
 		return $this->quality;
 		return $this->quality;
 	}
 	}
 
 
+	/**
+	 * @deprecated 5.0.0 use QROptions::$quality instead
+	 * @see        \chillerlan\QRCode\QROptions::$quality
+	 */
+	protected int $pngCompression;
+
 	/**
 	/**
 	 * @deprecated 5.0.0 use QROptions::$quality instead
 	 * @deprecated 5.0.0 use QROptions::$quality instead
 	 * @see        \chillerlan\QRCode\QROptions::$quality
 	 * @see        \chillerlan\QRCode\QROptions::$quality
@@ -600,12 +612,18 @@ trait QROptionsTrait{
 		return $this->quality;
 		return $this->quality;
 	}
 	}
 
 
+	/**
+	 * @deprecated 5.0.0 use QROptions::$transparencyColor instead
+	 * @see        \chillerlan\QRCode\QROptions::$transparencyColor
+	 */
+	protected array $imageTransparencyBG;
+
 	/**
 	/**
 	 * @deprecated 5.0.0 use QROptions::$transparencyColor instead
 	 * @deprecated 5.0.0 use QROptions::$transparencyColor instead
 	 * @see        \chillerlan\QRCode\QROptions::$transparencyColor
 	 * @see        \chillerlan\QRCode\QROptions::$transparencyColor
 	 * @codeCoverageIgnore
 	 * @codeCoverageIgnore
 	 */
 	 */
-	protected function set_imageTransparencyBG(array $imageTransparencyBG):void{
+	protected function set_imageTransparencyBG(?array $imageTransparencyBG):void{
 		$this->transparencyColor = $imageTransparencyBG;
 		$this->transparencyColor = $imageTransparencyBG;
 	}
 	}
 
 
@@ -614,16 +632,22 @@ trait QROptionsTrait{
 	 * @see        \chillerlan\QRCode\QROptions::$transparencyColor
 	 * @see        \chillerlan\QRCode\QROptions::$transparencyColor
 	 * @codeCoverageIgnore
 	 * @codeCoverageIgnore
 	 */
 	 */
-	protected function get_imageTransparencyBG(){
+	protected function get_imageTransparencyBG():?array{
 		return $this->transparencyColor;
 		return $this->transparencyColor;
 	}
 	}
 
 
+	/**
+	 * @deprecated 5.0.0 use QROptions::$bgColor instead
+	 * @see        \chillerlan\QRCode\QROptions::$bgColor
+	 */
+	protected string $imagickBG;
+
 	/**
 	/**
 	 * @deprecated 5.0.0 use QROptions::$bgColor instead
 	 * @deprecated 5.0.0 use QROptions::$bgColor instead
 	 * @see        \chillerlan\QRCode\QROptions::$bgColor
 	 * @see        \chillerlan\QRCode\QROptions::$bgColor
 	 * @codeCoverageIgnore
 	 * @codeCoverageIgnore
 	 */
 	 */
-	protected function set_imagickBG(string $imagickBG):void{
+	protected function set_imagickBG(?string $imagickBG):void{
 		$this->bgColor = $imagickBG;
 		$this->bgColor = $imagickBG;
 	}
 	}
 
 
@@ -632,7 +656,7 @@ trait QROptionsTrait{
 	 * @see        \chillerlan\QRCode\QROptions::$bgColor
 	 * @see        \chillerlan\QRCode\QROptions::$bgColor
 	 * @codeCoverageIgnore
 	 * @codeCoverageIgnore
 	 */
 	 */
-	protected function get_imagickBG(){
+	protected function get_imagickBG():?string{
 		return $this->bgColor;
 		return $this->bgColor;
 	}
 	}