Просмотр исходного кода

:octocat: moved mask pattern clamp to options

codemasher 7 лет назад
Родитель
Сommit
736d05dd5b
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 1
      src/QRCode.php
  2. 4 0
      src/QROptionsTrait.php

+ 1 - 1
src/QRCode.php

@@ -156,7 +156,7 @@ class QRCode{
 
 
 		$maskPattern = $this->options->maskPattern === $this::MASK_PATTERN_AUTO
 		$maskPattern = $this->options->maskPattern === $this::MASK_PATTERN_AUTO
 			? $this->getBestMaskPattern()
 			? $this->getBestMaskPattern()
-			: min(7, max(0, (int)$this->options->maskPattern));
+			: $this->options->maskPattern;
 
 
 		$matrix = $this->dataInterface->initMatrix($maskPattern);
 		$matrix = $this->dataInterface->initMatrix($maskPattern);
 
 

+ 4 - 0
src/QROptionsTrait.php

@@ -251,6 +251,10 @@ trait QROptionsTrait{
 		$min = $this->versionMin;
 		$min = $this->versionMin;
 		$this->versionMin = (int)min($min, $max);
 		$this->versionMin = (int)min($min, $max);
 		$this->versionMax = (int)max($min, $max);
 		$this->versionMax = (int)max($min, $max);
+
+		if($this->maskPattern !== QRCode::MASK_PATTERN_AUTO){
+			$this->maskPattern = min(7, max(0, (int)$this->maskPattern));
+		}
 	}
 	}
 
 
 }
 }