Fix missing sprintf and add tests

alamirault · alamirault · commit 0c66f9100f17 · 2021-12-28T13:51:45.000+01:00
diff --git a/src/Symfony/Component/Mime/Crypto/DkimSigner.php b/src/Symfony/Component/Mime/Crypto/DkimSigner.php
@@ -62,7 +62,7 @@ public function sign(Message $message, array $options = []): Message
     {
         $options += $this->defaultOptions;
         if (!\in_array($options['algorithm'], [self::ALGO_SHA256, self::ALGO_ED25519], true)) {
-            throw new InvalidArgumentException('Invalid DKIM signing algorithm "%s".', $options['algorithm']);
+            throw new InvalidArgumentException(sprintf('Invalid DKIM signing algorithm "%s".', $options['algorithm']));
         }
         $headersToIgnore['return-path'] = true;
         $headersToIgnore['x-transport'] = true;
diff --git a/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php b/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Crypto\DkimSigner;
 use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\Message;
 
 /**
  * @group time-sensitive
@@ -90,6 +91,21 @@ public function getSignData()
         ];
     }
 
+    public function testSignWithUnsupportedAlgorithm()
+    {
+        $message = $this->createMock(Message::class);
+
+        $signer = new DkimSigner(self::$pk, 'testdkim.symfony.net', 'sf', [
+            'algorithm' => 'unsupported-value',
+        ]);
+
+        $this->expectExceptionObject(
+            new \LogicException('Invalid DKIM signing algorithm "unsupported-value".')
+        );
+
+        $signer->sign($message, []);
+    }
+
     /**
      * @dataProvider getCanonicalizeHeaderData
      */
diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
@@ -37,7 +37,7 @@ class AccessListener extends AbstractListener
     public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionManagerInterface $accessDecisionManager, AccessMapInterface $map, bool $exceptionOnNoToken = false)
     {
         if (false !== $exceptionOnNoToken) {
-            throw new \LogicException('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__);
+            throw new \LogicException(sprintf('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__));
         }
 
         $this->tokenStorage = $tokenStorage;
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
@@ -266,4 +266,18 @@ public function testLazyPublicPagesShouldNotAccessTokenStorage()
         $listener = new AccessListener($tokenStorage, $this->createMock(AccessDecisionManagerInterface::class), $accessMap, false);
         $listener(new LazyResponseEvent(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST)));
     }
+
+    public function testConstructWithTrueExceptionOnNoToken()
+    {
+        $tokenStorage = $this->createMock(TokenStorageInterface::class);
+        $tokenStorage->expects($this->never())->method(self::anything());
+
+        $accessMap = $this->createMock(AccessMapInterface::class);
+
+        $this->expectExceptionObject(
+            new \LogicException('Argument $exceptionOnNoToken of "Symfony\Component\Security\Http\Firewall\AccessListener::__construct()" must be set to "false".')
+        );
+
+        new AccessListener($tokenStorage, $this->createMock(AccessDecisionManagerInterface::class), $accessMap, true);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function sign(Message $message, array $options = []): Message`
`62`	`62`	`{`
`63`	`63`	`$options += $this->defaultOptions;`
`64`	`64`	`if (!\in_array($options['algorithm'], [self::ALGO_SHA256, self::ALGO_ED25519], true)) {`
`65`		`- throw new InvalidArgumentException('Invalid DKIM signing algorithm "%s".', $options['algorithm']);`
	`65`	`+ throw new InvalidArgumentException(sprintf('Invalid DKIM signing algorithm "%s".', $options['algorithm']));`
`66`	`66`	`}`
`67`	`67`	`$headersToIgnore['return-path'] = true;`
`68`	`68`	`$headersToIgnore['x-transport'] = true;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class AccessListener extends AbstractListener`
`37`	`37`	`public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionManagerInterface $accessDecisionManager, AccessMapInterface $map, bool $exceptionOnNoToken = false)`
`38`	`38`	`{`
`39`	`39`	`if (false !== $exceptionOnNoToken) {`
`40`		`- throw new \LogicException('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__);`
	`40`	`+ throw new \LogicException(sprintf('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`$this->tokenStorage = $tokenStorage;`