Enhance key handling in DefuseEncryptor and HaliteEncryptor

- Trimmed whitespace from the encryption key read from the key file in DefuseEncryptor to prevent potential issues with key formatting.
- Introduced a new method in HaliteEncryptor to normalize the key file by removing leading/trailing whitespace, ensuring compatibility with Halite's hex decoder.
- Added error handling for invalid key formats in HaliteEncryptor, providing clearer runtime exceptions for users.

Author: HecFranco

src/Encryptors/DefuseEncryptor.php

@@ -55,7 +55,7 @@ private function getKey(): string
     {
         if ($this->encryptionKey === null) {
             if ($this->fs->exists($this->keyFile)) {
-                $this->encryptionKey = file_get_contents($this->keyFile);
+                $this->encryptionKey = trim(file_get_contents($this->keyFile));
             } else {
                 $string = random_bytes(255);
                 $this->encryptionKey = bin2hex($string);

src/Encryptors/HaliteEncryptor.php

@@ -69,13 +69,39 @@ private function getKey(): EncryptionKey
     {
         if ($this->encryptionKey === null) {
             try {
+                $this->normalizeKeyFile();
                 $this->encryptionKey = KeyFactory::loadEncryptionKey($this->keyFile);
             } catch (CannotPerformOperation $e) {
                 $this->encryptionKey = KeyFactory::generateEncryptionKey();
                 KeyFactory::save($this->encryptionKey, $this->keyFile);
+            } catch (\RangeException $e) {
+                throw new \RuntimeException(
+                    sprintf(
+                        'Invalid Halite key file at "%s": key must be hex-encoded (e.g. generated by doctrine:encrypt:generate-secret-key). Error: %s',
+                        $this->keyFile,
+                        $e->getMessage()
+                    ),
+                    0,
+                    $e
+                );
             }
         }
 
         return $this->encryptionKey;
     }
+
+    /**
+     * Removes leading/trailing whitespace (e.g. trailing newline) from the key file so Halite's hex decoder does not fail.
+     */
+    private function normalizeKeyFile(): void
+    {
+        if (!is_file($this->keyFile) || !is_readable($this->keyFile)) {
+            return;
+        }
+        $content = file_get_contents($this->keyFile);
+        $trimmed = trim($content);
+        if ($trimmed !== $content) {
+            file_put_contents($this->keyFile, $trimmed);
+        }
+    }
 }