Refactor getAAD method return type from nullable to non-nullable string (#638)

Spomky · web-flow · commit f50494a9b02a · 2025-10-22T10:07:59.000+02:00
diff --git a/.ci-tools/phpstan-baseline.neon b/.ci-tools/phpstan-baseline.neon
diff --git a/performance/JWE/A128GCMKWBench.php b/performance/JWE/A128GCMKWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/A128KWBench.php b/performance/JWE/A128KWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/A192GCMKWBench.php b/performance/JWE/A192GCMKWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/A192KWBench.php b/performance/JWE/A192KWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/A256GCMKWBench.php b/performance/JWE/A256GCMKWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/A256KWBench.php b/performance/JWE/A256KWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/ECDHESA128KWBench.php b/performance/JWE/ECDHESA128KWBench.php
@@ -220,7 +220,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/ECDHESA192KWBench.php b/performance/JWE/ECDHESA192KWBench.php
@@ -220,7 +220,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/ECDHESA256KWBench.php b/performance/JWE/ECDHESA256KWBench.php
@@ -220,7 +220,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/ECDHESBench.php b/performance/JWE/ECDHESBench.php
@@ -292,7 +292,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/PBES2HS256A128KWBench.php b/performance/JWE/PBES2HS256A128KWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/PBES2HS384A192KWBench.php b/performance/JWE/PBES2HS384A192KWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/PBES2HS512A256KWBench.php b/performance/JWE/PBES2HS512A256KWBench.php
@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/RSA1_5Bench.php b/performance/JWE/RSA1_5Bench.php
@@ -199,7 +199,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/RSAOAEP256Bench.php b/performance/JWE/RSAOAEP256Bench.php
@@ -199,7 +199,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/performance/JWE/RSAOAEPBench.php b/performance/JWE/RSAOAEPBench.php
@@ -199,7 +199,7 @@ public function dataRecipientPublicKeys(): array
     }
 
     #[Override]
-    protected function getAAD(): ?string
+    protected function getAAD(): string
     {
         return 'A,B,C,D';
     }
diff --git a/tests/Bundle/JoseFramework/TestBundle/Service/MockClientCallback.php b/tests/Bundle/JoseFramework/TestBundle/Service/MockClientCallback.php
@@ -12,7 +12,7 @@ final class MockClientCallback extends MockHttpClient
 {
     private null|MockResponse $response = null;
 
-    public function __invoke(string $method, string $url, array $options = []): ?MockResponse
+    public function __invoke(string $method, string $url, array $options = []): MockResponse
     {
         if ($this->response === null) {
             throw new RuntimeException(sprintf(

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function dataRecipientPublicKeys(): array`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`#[Override]`
`109`		`- protected function getAAD(): ?string`
	`109`	`+ protected function getAAD(): string`
`110`	`110`	`{`
`111`	`111`	`return 'A,B,C,D';`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public function dataRecipientPublicKeys(): array`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`#[Override]`
`223`		`- protected function getAAD(): ?string`
	`223`	`+ protected function getAAD(): string`
`224`	`224`	`{`
`225`	`225`	`return 'A,B,C,D';`
`226`	`226`	`}`