make QROutputInterface::moduleValueIsValid() public static

Author: codemasher

examples/custom_output.php

@@ -23,7 +23,7 @@ class MyCustomOutput extends QROutputAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected function moduleValueIsValid($value):bool{
+	public static function moduleValueIsValid($value):bool{
 		// TODO: Implement moduleValueIsValid() method. (abstract)
 		return false;
 	}

src/Output/QREps.php

@@ -25,7 +25,7 @@ class QREps extends QROutputAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected function moduleValueIsValid($value):bool{
+	public static function moduleValueIsValid($value):bool{
 
 		if(!is_array($value) || count($value) < 3){
 			return false;

src/Output/QRFpdf.php

@@ -47,7 +47,7 @@ public function __construct(SettingsContainerInterface $options, QRMatrix $matri
 	/**
 	 * @inheritDoc
 	 */
-	protected function moduleValueIsValid($value):bool{
+	public static function moduleValueIsValid($value):bool{
 
 		if(!is_array($value) || count($value) < 3){
 			return false;
@@ -94,7 +94,7 @@ public function dump(string $file = null){
 		$fpdf = new FPDF('P', $this->options->fpdfMeasureUnit, [$this->length, $this->length]);
 		$fpdf->AddPage();
 
-		if($this->moduleValueIsValid($this->options->bgColor)){
+		if($this::moduleValueIsValid($this->options->bgColor)){
 			$bgColor = $this->getModuleValue($this->options->bgColor);
 			/** @phan-suppress-next-line PhanParamTooFewUnpack */
 			$fpdf->SetFillColor(...$bgColor);

src/Output/QRGdImage.php

@@ -82,7 +82,7 @@ public function __construct(SettingsContainerInterface $options, QRMatrix $matri
 	/**
 	 * @inheritDoc
 	 */
-	protected function moduleValueIsValid($value):bool{
+	public static function moduleValueIsValid($value):bool{
 
 		if(!is_array($value) || count($value) < 3){
 			return false;
@@ -185,7 +185,7 @@ protected function setBgColor():void{
 			return;
 		}
 
-		if($this->moduleValueIsValid($this->options->bgColor)){
+		if($this::moduleValueIsValid($this->options->bgColor)){
 			$this->background = $this->getModuleValue($this->options->bgColor);
 
 			return;
@@ -205,7 +205,7 @@ protected function setTransparencyColor():void{
 
 		$transparencyColor = $this->background;
 
-		if($this->moduleValueIsValid($this->options->transparencyColor)){
+		if($this::moduleValueIsValid($this->options->transparencyColor)){
 			$transparencyColor = $this->getModuleValue($this->options->transparencyColor);
 		}
 

src/Output/QRImagick.php

@@ -64,7 +64,7 @@ public function __construct(SettingsContainerInterface $options, QRMatrix $matri
 	 * @see https://www.php.net/manual/imagickpixel.construct.php
 	 * @inheritDoc
 	 */
-	protected function moduleValueIsValid($value):bool{
+	public static function moduleValueIsValid($value):bool{
 		return is_string($value);
 	}
 
@@ -124,7 +124,7 @@ protected function setBgColor():void{
 			return;
 		}
 
-		if($this->moduleValueIsValid($this->options->bgColor)){
+		if($this::moduleValueIsValid($this->options->bgColor)){
 			$this->background = $this->getModuleValue($this->options->bgColor);
 
 			return;
@@ -144,7 +144,7 @@ protected function setTransparencyColor():void{
 
 		$transparencyColor = $this->background;
 
-		if($this->moduleValueIsValid($this->options->transparencyColor)){
+		if($this::moduleValueIsValid($this->options->transparencyColor)){
 			$transparencyColor = $this->getModuleValue($this->options->transparencyColor);
 		}
 

src/Output/QRMarkup.php

@@ -20,7 +20,7 @@ abstract class QRMarkup extends QROutputAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected function moduleValueIsValid($value):bool{
+	public static function moduleValueIsValid($value):bool{
 		return is_string($value);
 	}
 

src/Output/QROutputAbstract.php

@@ -84,20 +84,13 @@ protected function setModuleValues():void{
 		foreach($this::DEFAULT_MODULE_VALUES as $M_TYPE => $defaultValue){
 			$value = ($this->options->moduleValues[$M_TYPE] ?? null);
 
-			$this->moduleValues[$M_TYPE] = $this->moduleValueIsValid($value)
+			$this->moduleValues[$M_TYPE] = $this::moduleValueIsValid($value)
 				? $this->getModuleValue($value)
 				: $this->getDefaultModuleValue($defaultValue);
 		}
 
 	}
 
-	/**
-	 * Determines whether the given value is valid
-	 *
-	 * @param mixed|null $value
-	 */
-	abstract protected function moduleValueIsValid($value):bool;
-
 	/**
 	 * Returns the final value for the given input (return value depends on the output module)
 	 *

src/Output/QROutputInterface.php

@@ -86,6 +86,13 @@ interface QROutputInterface{
 		QRMatrix::M_TEST_DARK      => true,
 	];
 
+	/**
+	 * Determines whether the given value is valid
+	 *
+	 * @param mixed|null $value
+	 */
+	public static function moduleValueIsValid($value):bool;
+
 	/**
 	 * generates the output, optionally dumps it to a file, and returns it
 	 *

src/Output/QRString.php

@@ -23,7 +23,7 @@ class QRString extends QROutputAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected function moduleValueIsValid($value):bool{
+	public static function moduleValueIsValid($value):bool{
 		return is_string($value);
 	}