minor #191 [ci] php-cs-fixer it up

jrushlow · web-flow · commit a88ba79d0523 · 2024-07-30T04:40:57.000-04:00
diff --git a/src/Model/VerifyEmailSignatureComponents.php b/src/Model/VerifyEmailSignatureComponents.php
@@ -122,7 +122,7 @@ public function getExpirationMessageData(): array
     public function getExpiresAtIntervalInstance(): \DateInterval
     {
         if (null === $this->generatedAt) {
-            throw new \LogicException(sprintf('%s initialized without setting the $generatedAt timestamp.', self::class));
+            throw new \LogicException(\sprintf('%s initialized without setting the $generatedAt timestamp.', self::class));
         }
 
         $createdAtTime = \DateTimeImmutable::createFromFormat('U', (string) $this->generatedAt);
diff --git a/src/VerifyEmailHelper.php b/src/VerifyEmailHelper.php
@@ -94,7 +94,7 @@ public function validateEmailConfirmationFromRequest(Request $request, string $u
     {
         /** @legacy - Remove in 2.0 */
         if (!$this->uriSigner instanceof UriSigner) {
-            throw new \RuntimeException(sprintf('An instance of %s is required, provided by symfony/http-kernel >=6.4, to validate an email confirmation.', UriSigner::class));
+            throw new \RuntimeException(\sprintf('An instance of %s is required, provided by symfony/http-kernel >=6.4, to validate an email confirmation.', UriSigner::class));
         }
 
         if (!$this->uriSigner->checkRequest($request)) {
diff --git a/tests/AcceptanceTests/VerifyEmailAcceptanceTest.php b/tests/AcceptanceTests/VerifyEmailAcceptanceTest.php
@@ -49,7 +49,7 @@ public function testGenerateSignature(): void
 
         $expectedSignature = base64_encode(hash_hmac(
             'sha256',
-            sprintf('http://localhost/verify/user?expires=%s&token=%s', $expiresAt, urlencode($expectedToken)),
+            \sprintf('http://localhost/verify/user?expires=%s&token=%s', $expiresAt, urlencode($expectedToken)),
             'foo',
             true
         ));
@@ -59,7 +59,7 @@ public function testGenerateSignature(): void
 
         self::assertTrue(hash_equals($expectedSignature, $result['signature']));
         self::assertSame(
-            sprintf('http://localhost/verify/user?expires=%s&signature=%s&token=%s', $expiresAt, urlencode($expectedSignature), urlencode($expectedToken)),
+            \sprintf('http://localhost/verify/user?expires=%s&signature=%s&token=%s', $expiresAt, urlencode($expectedSignature), urlencode($expectedToken)),
             $signature
         );
     }
@@ -75,7 +75,7 @@ public function testValidateEmailSignature(): void
         $helper = $container->get(VerifyEmailAcceptanceFixture::class)->helper;
         $expires = new \DateTimeImmutable('+1 hour');
 
-        $uriToTest = sprintf(
+        $uriToTest = \sprintf(
             '/verify/user?%s',
             http_build_query([
                 'expires' => $expires->getTimestamp(),
@@ -90,7 +90,7 @@ public function testValidateEmailSignature(): void
 
         $signature = base64_encode(hash_hmac('sha256', $uriToTest, 'foo', true));
 
-        $test = sprintf('%s&signature=%s', $uriToTest, urlencode($signature));
+        $test = \sprintf('%s&signature=%s', $uriToTest, urlencode($signature));
 
         $helper->validateEmailConfirmation($test, '1234', 'jr@rushlow.dev');
         $this->assertTrue(true, 'Test correctly does not throw an exception');
@@ -107,7 +107,7 @@ public function testValidateUsingRequestObject(): void
         $helper = $container->get(VerifyEmailAcceptanceFixture::class)->helper;
         $expires = new \DateTimeImmutable('+1 hour');
 
-        $uriToTest = sprintf(
+        $uriToTest = \sprintf(
             'http://localhost/verify/user?%s',
             http_build_query([
                 'expires' => $expires->getTimestamp(),
@@ -122,7 +122,7 @@ public function testValidateUsingRequestObject(): void
 
         $signature = base64_encode(hash_hmac('sha256', $uriToTest, 'foo', true));
 
-        $test = sprintf('%s&signature=%s', $uriToTest, urlencode($signature));
+        $test = \sprintf('%s&signature=%s', $uriToTest, urlencode($signature));
 
         $helper->validateEmailConfirmationFromRequest(Request::create(uri: $test), '1234', 'jr@rushlow.dev');
         $this->assertTrue(true, 'Test correctly does not throw an exception');
diff --git a/tests/FunctionalTests/VerifyEmailHelperFunctionalTest.php b/tests/FunctionalTests/VerifyEmailHelperFunctionalTest.php
@@ -52,7 +52,7 @@ public function testGenerateSignature(): void
             ->expects($this->once())
             ->method('generate')
             ->with('app_verify_route', ['expires' => $this->expiryTimestamp, 'token' => $token])
-            ->willReturn(sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, urlencode($token)))
+            ->willReturn(\sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, urlencode($token)))
         ;
 
         $result = $this->getHelper()->generateSignature('app_verify_route', '1234', 'jr@rushlow.dev');
@@ -91,7 +91,7 @@ private function getTestToken(): string
     private function getTestSignature(): string
     {
         $query = http_build_query(['expires' => $this->expiryTimestamp, 'token' => $this->getTestToken()], '', '&');
-        $uri = sprintf('/verify?%s', $query);
+        $uri = \sprintf('/verify?%s', $query);
 
         return base64_encode(hash_hmac('sha256', $uri, 'foo', true));
     }
@@ -100,7 +100,7 @@ private function getTestSignedUri(): string
     {
         $token = urlencode($this->getTestToken());
 
-        $uri = sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, $token);
+        $uri = \sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, $token);
         $signature = base64_encode(hash_hmac('sha256', $uri, 'foo', true));
 
         $uriComponents = parse_url($uri);
@@ -111,7 +111,7 @@ private function getTestSignedUri(): string
 
         $sortedParams = http_build_query($params);
 
-        return sprintf('/verify?%s', $sortedParams);
+        return \sprintf('/verify?%s', $sortedParams);
     }
 
     private function getHelper(): VerifyEmailHelperInterface
diff --git a/tests/UnitTests/Model/VerifyEmailSignatureComponentsTest.php b/tests/UnitTests/Model/VerifyEmailSignatureComponentsTest.php
@@ -40,7 +40,7 @@ public function testTranslations(int $lifetime, int $expectedInterval, string $u
         $components = new VerifyEmailSignatureComponents($expire, 'some-uri', $created);
 
         self::assertSame(
-            sprintf('%%count%% %s|%%count%% %ss', $unitOfMeasure, $unitOfMeasure),
+            \sprintf('%%count%% %s|%%count%% %ss', $unitOfMeasure, $unitOfMeasure),
             $components->getExpirationMessageKey()
         );
 
diff --git a/tests/UnitTests/VerifyEmailHelperTest.php b/tests/UnitTests/VerifyEmailHelperTest.php
@@ -59,7 +59,7 @@ public function testSignatureIsGenerated(): void
     {
         $expires = time() + 3600;
 
-        $expectedSignedUrl = sprintf('/verify?expires=%s&signature=1234&token=hashedToken', $expires);
+        $expectedSignedUrl = \sprintf('/verify?expires=%s&signature=1234&token=hashedToken', $expires);
 
         $this->tokenGenerator
             ->expects($this->once())
@@ -72,13 +72,13 @@ public function testSignatureIsGenerated(): void
             ->expects($this->once())
             ->method('generate')
             ->with('app_verify_route', ['token' => 'hashedToken', 'expires' => $expires])
-            ->willReturn(sprintf('/verify?expires=%s&token=hashedToken', $expires))
+            ->willReturn(\sprintf('/verify?expires=%s&token=hashedToken', $expires))
         ;
 
         $this->mockSigner
             ->expects($this->once())
             ->method('sign')
-            ->with(sprintf('/verify?expires=%s&token=hashedToken', $expires))
+            ->with(\sprintf('/verify?expires=%s&token=hashedToken', $expires))
             ->willReturn($expectedSignedUrl)
         ;
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function getExpirationMessageData(): array`
`122`	`122`	`public function getExpiresAtIntervalInstance(): \DateInterval`
`123`	`123`	`{`
`124`	`124`	`if (null === $this->generatedAt) {`
`125`		`- throw new \LogicException(sprintf('%s initialized without setting the $generatedAt timestamp.', self::class));`
	`125`	`+ throw new \LogicException(\sprintf('%s initialized without setting the $generatedAt timestamp.', self::class));`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`$createdAtTime = \DateTimeImmutable::createFromFormat('U', (string) $this->generatedAt);`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function validateEmailConfirmationFromRequest(Request $request, string $u`
`94`	`94`	`{`
`95`	`95`	`/** @legacy - Remove in 2.0 */`
`96`	`96`	`if (!$this->uriSigner instanceof UriSigner) {`
`97`		`- throw new \RuntimeException(sprintf('An instance of %s is required, provided by symfony/http-kernel >=6.4, to validate an email confirmation.', UriSigner::class));`
	`97`	`+ throw new \RuntimeException(\sprintf('An instance of %s is required, provided by symfony/http-kernel >=6.4, to validate an email confirmation.', UriSigner::class));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if (!$this->uriSigner->checkRequest($request)) {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testGenerateSignature(): void`
`52`	`52`	`->expects($this->once())`
`53`	`53`	`->method('generate')`
`54`	`54`	`->with('app_verify_route', ['expires' => $this->expiryTimestamp, 'token' => $token])`
`55`		`- ->willReturn(sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, urlencode($token)))`
	`55`	`+ ->willReturn(\sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, urlencode($token)))`
`56`	`56`	`;`
`57`	`57`
`58`	`58`	`$result = $this->getHelper()->generateSignature('app_verify_route', '1234', 'jr@rushlow.dev');`
`@@ -91,7 +91,7 @@ private function getTestToken(): string`
`91`	`91`	`private function getTestSignature(): string`
`92`	`92`	`{`
`93`	`93`	`$query = http_build_query(['expires' => $this->expiryTimestamp, 'token' => $this->getTestToken()], '', '&');`
`94`		`- $uri = sprintf('/verify?%s', $query);`
	`94`	`+ $uri = \sprintf('/verify?%s', $query);`
`95`	`95`
`96`	`96`	`return base64_encode(hash_hmac('sha256', $uri, 'foo', true));`
`97`	`97`	`}`
`@@ -100,7 +100,7 @@ private function getTestSignedUri(): string`
`100`	`100`	`{`
`101`	`101`	`$token = urlencode($this->getTestToken());`
`102`	`102`
`103`		`- $uri = sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, $token);`
	`103`	`+ $uri = \sprintf('/verify?expires=%s&token=%s', $this->expiryTimestamp, $token);`
`104`	`104`	`$signature = base64_encode(hash_hmac('sha256', $uri, 'foo', true));`
`105`	`105`
`106`	`106`	`$uriComponents = parse_url($uri);`
`@@ -111,7 +111,7 @@ private function getTestSignedUri(): string`
`111`	`111`
`112`	`112`	`$sortedParams = http_build_query($params);`
`113`	`113`
`114`		`- return sprintf('/verify?%s', $sortedParams);`
	`114`	`+ return \sprintf('/verify?%s', $sortedParams);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`private function getHelper(): VerifyEmailHelperInterface`