Code Review changes

Author: WendellAdriel

packages/cryptography/tests/CreatesEncrypter.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Tempest\Cryptography\Tests;
+
+use Tempest\Cryptography\Encryption\EncryptionAlgorithm;
+use Tempest\Cryptography\Encryption\EncryptionConfig;
+use Tempest\Cryptography\Encryption\EncryptionKey;
+use Tempest\Cryptography\Encryption\GenericEncrypter;
+use Tempest\Cryptography\Signing\SigningAlgorithm;
+use Tempest\Cryptography\Signing\SigningConfig;
+use Tempest\DateTime\Duration;
+
+trait CreatesEncrypter
+{
+    use CreatesSigner;
+
+    private function createEncrypter(?string $key = null, false|Duration $minimumExecutionDuration = false): GenericEncrypter
+    {
+        $key ??= EncryptionKey::generate(EncryptionAlgorithm::AES_256_GCM)->toString();
+
+        return new GenericEncrypter(
+            signer: $this->createSigner(new SigningConfig(
+                algorithm: SigningAlgorithm::SHA256,
+                key: $key,
+                minimumExecutionDuration: $minimumExecutionDuration,
+            )),
+            config: new EncryptionConfig(
+                algorithm: EncryptionAlgorithm::AES_256_GCM,
+                key: $key,
+            ),
+        );
+    }
+}

packages/cryptography/tests/Encryption/EncryptionTest.php

@@ -12,32 +12,16 @@
 use Tempest\Cryptography\Encryption\GenericEncrypter;
 use Tempest\Cryptography\Signing\SigningAlgorithm;
 use Tempest\Cryptography\Signing\SigningConfig;
+use Tempest\Cryptography\Tests\CreatesEncrypter;
 use Tempest\Cryptography\Tests\CreatesSigner;
 use Tempest\Cryptography\Tests\HasMoreIntegerAssertions;
 use Tempest\DateTime\Duration;
 
 final class EncryptionTest extends TestCase
 {
-    use CreatesSigner;
+    use CreatesEncrypter;
     use HasMoreIntegerAssertions;
 
-    private function createEncrypter(?string $key = null, false|Duration $minimumExecutionDuration = false): GenericEncrypter
-    {
-        $key ??= EncryptionKey::generate(EncryptionAlgorithm::AES_256_GCM)->toString();
-
-        return new GenericEncrypter(
-            signer: $this->createSigner(new SigningConfig(
-                algorithm: SigningAlgorithm::SHA256,
-                key: $key,
-                minimumExecutionDuration: $minimumExecutionDuration,
-            )),
-            config: new EncryptionConfig(
-                algorithm: EncryptionAlgorithm::AES_256_GCM,
-                key: $key,
-            ),
-        );
-    }
-
     #[TestWith([''])]
     #[TestWith(['sensitive data'])]
     #[TestWith(['{"foo":"bar"}'])]

packages/http/src/Mappers/PsrRequestToGenericRequestMapper.php

@@ -82,9 +82,9 @@ public function map(mixed $from, mixed $to): GenericRequest
             ->to(GenericRequest::class);
     }
 
-    private function requestMethod(mixed $from, array $data): Method
+    private function requestMethod(PsrRequest $request, array $data): Method
     {
-        $originalMethod = Method::from($from->getMethod());
+        $originalMethod = Method::from($request->getMethod());
         if ($originalMethod !== Method::POST) {
             return $originalMethod;
         }

packages/http/tests/Mappers/PsrRequestToGenericRequestMapperTest.php

@@ -11,24 +11,22 @@
 use Psr\Http\Message\ServerRequestInterface;
 use ReflectionClass;
 use ReflectionMethod;
-use Tempest\Cryptography\Encryption\Encrypter;
+use Tempest\Cryptography\Tests\CreatesEncrypter;
 use Tempest\Http\Mappers\PsrRequestToGenericRequestMapper;
 use Tempest\Http\Method;
 
 final class PsrRequestToGenericRequestMapperTest extends TestCase
 {
+    use CreatesEncrypter;
+
     private PsrRequestToGenericRequestMapper $mapper;
-    private Encrypter $encrypter;
     private ReflectionMethod $requestMethod;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->encrypter = $this->createMock(Encrypter::class);
-        $this->encrypter->method('decrypt')->willReturnArgument(0);
-
-        $this->mapper = new PsrRequestToGenericRequestMapper($this->encrypter);
+        $this->mapper = new PsrRequestToGenericRequestMapper($this->createEncrypter());
 
         $reflection = new ReflectionClass($this->mapper);
         $this->requestMethod = $reflection->getMethod('requestMethod');