ソースを参照

:octocat: removed QROptionsTrait::$textDark and QROptionsTrait::$textLight

smiley 2 年 前
コミット
07eb6e38ff
3 ファイル変更3 行追加23 行削除
  1. 2 9
      examples/text.php
  2. 1 1
      src/Output/QRString.php
  3. 0 13
      src/QROptionsTrait.php

+ 2 - 9
examples/text.php

@@ -21,30 +21,23 @@ $options->quietzoneSize = 2;
 $options->outputType    = QROutputInterface::STRING_TEXT;
 $options->eol           = "\n";
 $options->textLineStart = str_repeat(' ', 6);
-$options->textDark      = QRString::ansi8('██', 253);
-$options->textLight     = QRString::ansi8('░░', 253);
 $options->moduleValues  = [
-	// finder
 	QRMatrix::M_FINDER_DARK    => QRString::ansi8('██', 124),
 	QRMatrix::M_FINDER         => QRString::ansi8('░░', 124),
 	QRMatrix::M_FINDER_DOT     => QRString::ansi8('██', 124),
-	// alignment
 	QRMatrix::M_ALIGNMENT_DARK => QRString::ansi8('██', 2),
 	QRMatrix::M_ALIGNMENT      => QRString::ansi8('░░', 2),
-	// timing
 	QRMatrix::M_TIMING_DARK    => QRString::ansi8('██', 184),
 	QRMatrix::M_TIMING         => QRString::ansi8('░░', 184),
-	// format
 	QRMatrix::M_FORMAT_DARK    => QRString::ansi8('██', 200),
 	QRMatrix::M_FORMAT         => QRString::ansi8('░░', 200),
-	// version
 	QRMatrix::M_VERSION_DARK   => QRString::ansi8('██', 21),
 	QRMatrix::M_VERSION        => QRString::ansi8('░░', 21),
-	// dark module
 	QRMatrix::M_DARKMODULE     => QRString::ansi8('██', 53),
-	// data
 	QRMatrix::M_DATA_DARK      => QRString::ansi8('██', 166),
 	QRMatrix::M_DATA           => QRString::ansi8('░░', 166),
+	QRMatrix::M_QUIETZONE      => QRString::ansi8('░░', 253),
+	QRMatrix::M_SEPARATOR      => QRString::ansi8('░░', 253),
 ];
 
 

+ 1 - 1
src/Output/QRString.php

@@ -38,7 +38,7 @@ class QRString extends QROutputAbstract{
 	 * @inheritDoc
 	 */
 	protected function getDefaultModuleValue(bool $isDark):string{
-		return ($isDark) ? $this->options->textDark : $this->options->textLight;
+		return ($isDark) ? '██' : '░░';
 	}
 
 	/**

+ 0 - 13
src/QROptionsTrait.php

@@ -425,19 +425,6 @@ trait QROptionsTrait{
 	 * QRString settings
 	 */
 
-	/**
-	 * String substitute for dark
-	 *
-	 * @see https://en.wikipedia.org/wiki/Block_Elements
-	 * @see https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
-	 */
-	protected string $textDark = '██';
-
-	/**
-	 * String substitute for light
-	 */
-	protected string $textLight = '░░';
-
 	/**
 	 * An optional line prefix, e.g. empty space to align the QR Code in a console
 	 */