DkimSigner: removed testmode, added getTime()

Author: dg

src/Mail/DkimSigner.php

@@ -43,9 +43,6 @@ class DkimSigner implements Signer
 	/** @var string */
 	private $passPhrase;
 
-	/** @var bool */
-	private $testMode;
-
 
 	/** @throws Nette\NotSupportedException */
 	public function __construct(array $options, array $signHeaders = self::DEFAULT_SIGN_HEADERS)
@@ -57,7 +54,6 @@ public function __construct(array $options, array $signHeaders = self::DEFAULT_S
 		$this->selector = $options['selector'] ?? '';
 		$this->privateKey = $options['privateKey'] ?? '';
 		$this->passPhrase = $options['passPhrase'] ?? '';
-		$this->testMode = (bool) ($options['testMode'] ?? false);
 		$this->signHeaders = count($signHeaders) > 0 ? $signHeaders : self::DEFAULT_SIGN_HEADERS;
 	}
 
@@ -86,7 +82,7 @@ protected function getSignature(Message $message, string $header, string $body):
 				'q' => 'dns/txt',
 				'l' => strlen($body),
 				's' => $this->selector,
-				't' => $this->testMode ? 0 : time(),
+				't' => $this->getTime(),
 				'c' => 'relaxed/simple',
 				'h' => implode(':', $this->getSignedHeaders($message)),
 				'd' => $this->domain,
@@ -168,4 +164,10 @@ protected function getSignedHeaders(Message $message): array
 			return $message->getHeader($name) !== null;
 		});
 	}
+
+
+	protected function getTime(): int
+	{
+		return time();
+	}
 }

tests/Mail/Mail.dkim.sign.phpt

@@ -25,12 +25,20 @@ $mail->addTo('Lady Jane <[email protected]>');
 $mail->setSubject('Hello Jane!');
 $mail->setBody('Příliš žluťoučký kůň');
 
-$signer = new DkimSigner([
+$signer = new class ([
 	'privateKey' => $privateKey,
 	'domain' => 'nette.org',
 	'selector' => 'selector',
-	'testMode' => true,
-], ['From', 'To', 'Subject']);
+], [
+	'From',
+	'To',
+	'Subject',
+]) extends DkimSigner {
+	protected function getTime(): int
+	{
+		return 0;
+	}
+};
 
 Assert::match(<<<'EOD'
 MIME-Version: 1.0