QRMarkup: move base64 transformation to abstract

Author: codemasher

src/Output/QRMarkup.php

@@ -20,10 +20,16 @@ abstract class QRMarkup extends QROutputAbstract{
 	 * @inheritDoc
 	 */
 	public function dump(string $file = null):string{
-		$data = $this->createMarkup($file !== null);
+		$saveToFile = $file !== null;
+		$data       = $this->createMarkup($saveToFile);
 
 		$this->saveToFile($data, $file);
 
+		// transform to data URI only when not saving to file
+		if(!$saveToFile && $this->options->outputBase64){
+			return $this->toBase64DataURI($data);
+		}
+
 		return $data;
 	}
 

src/Output/QRMarkupSVG.php

@@ -83,11 +83,6 @@ protected function createMarkup(bool $saveToFile):string{
 		// close svg
 		$svg .= sprintf('%1$s</svg>%1$s', $this->eol);
 
-		// transform to data URI only when not saving to file
-		if(!$saveToFile && $this->options->outputBase64){
-			return $this->toBase64DataURI($svg);
-		}
-
 		return $svg;
 	}
 

src/Output/QRMarkupXML.php

@@ -61,11 +61,6 @@ protected function createMarkup(bool $saveToFile):string{
 
 		$xml = $this->dom->saveXML();
 
-		// transform to data URI only when not saving to file
-		if(!$saveToFile && $this->options->outputBase64){
-			return $this->toBase64DataURI($xml);
-		}
-
 		return $xml;
 	}