Refactor test directory structure and enhance key generation command

- Renamed test directory from `Tests` to `tests` for consistency.
- Updated references in `.php-cs-fixer.dist.php`, `composer.json`, and `phpunit.xml.dist` to reflect the new directory name.
- Enhanced `doctrine:encrypt:generate-secret-key` command to support generating keys for all configs or a specific config with confirmation for overwriting existing keys.
- Updated documentation in `COMMANDS.md` to clarify command usage and behavior.
- Added new functional tests for encryption behavior and key generation scenarios.

Author: HecFranco

.php-cs-fixer.dist.php

@@ -2,7 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . '/src')
-    ->in(__DIR__ . '/Tests')
+    ->in(__DIR__ . '/tests')
     ->name('*.php');
 
 return (new PhpCsFixer\Config())

README.md

@@ -88,7 +88,7 @@ Key files: one per config, e.g. `.Halite.personal_data.key`, `.Defuse.financial_
 .Defuse.*.key
 ```
 
-Generate the default key: `php bin/console doctrine:encrypt:generate-secret-key` (Halite only). See [docs/CONFIGURATION.md](docs/CONFIGURATION.md) and [docs/COMMANDS.md](docs/COMMANDS.md).
+Generate keys: `php bin/console doctrine:encrypt:generate-secret-key` (creates missing Halite/Defuse keys for all configs, or pass a config alias). See [docs/CONFIGURATION.md](docs/CONFIGURATION.md) and [docs/COMMANDS.md](docs/COMMANDS.md).
 
 ### Single encryptor (one config)
 

Tests/Unit/Command/GenerateSecretKeyCommandTest.php

@@ -61,7 +61,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Nowo\\DoctrineEncryptBundle\\Tests\\": "Tests/"
+      "Nowo\\DoctrineEncryptBundle\\Tests\\": "tests/"
     }
   },
   "archive": {

composer.json

@@ -21,6 +21,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [2.0.5] - 2026-02-20
+
+### Added
+
+- **doctrine:encrypt:generate-secret-key:** Optional argument `config` to generate the key for a single config; when the key file already exists, the command asks for confirmation before overwriting. Without argument, the command now checks all configs (all `secret_directory_path` entries) and creates a missing key file for each Halite or Defuse config; configs that already have a key are skipped with a message.
+- **Makefile:** Targets `validate` (runs `composer validate --strict`) and `update` (runs `composer update`); `make qa` now runs `validate` before cs-check and test.
+
+### Changed
+
+- **Test directory:** The test directory has been renamed from `Tests` to `tests` (lowercase). PHP namespaces remain `Nowo\DoctrineEncryptBundle\Tests\`; only the folder and references in `phpunit.xml.dist`, `composer.json` (autoload-dev), and `.php-cs-fixer.dist.php` changed.
+- **symfony/var-exporter:** Kept in `require` (not only in require-dev) so that Doctrine ORM 3.x LazyGhost is available in all environments (CI and production when using lazy loading). This fixes functional test failures on PHP 8.4/8.5 with Symfony 8.0 ("Symfony LazyGhost is not available").
+- **CI:** Install step pins `symfony/var-exporter:^7.4` so Doctrine ORM accepts the installed version for LazyGhost; coverage job also requires `symfony/var-exporter`.
+- **Documentation:** [COMMANDS.md](docs/COMMANDS.md) updated: encrypt/decrypt database commands use argument `config` (config alias); generate-secret-key documents the new behaviour (all configs vs single config with confirmation).
+
+No upgrade steps required from 2.0.4. See [UPGRADING.md](UPGRADING.md#upgrading-to-205).
+
+---
+
 ## [2.0.4] - 2026-02-19
 
 ### Fixed

docs/CHANGELOG.md

@@ -37,14 +37,15 @@ php bin/console doctrine:encrypt:database
 
 Optional arguments:
 
-- **encryptor** — Encryptor to use (e.g. `Halite`, `Defuse`), or a class name. Default: the configured default encryptor.
+- **config** — Config alias to use (e.g. `default`, `personal_data`, `financial_data`). If omitted, all configs are processed in turn.
 - **batchSize** — Number of entities to flush per batch (default: 20).
 
 Examples:
 
 ```bash
-php bin/console doctrine:encrypt:database Halite
-php bin/console doctrine:encrypt:database Defuse 50
+php bin/console doctrine:encrypt:database
+php bin/console doctrine:encrypt:database default 50
+php bin/console doctrine:encrypt:database personal_data
 ```
 
 ## Decrypt database
@@ -57,24 +58,33 @@ php bin/console doctrine:decrypt:database
 
 Optional arguments:
 
-- **encryptor** — Encryptor to use (e.g. `Halite`, `Defuse`), or a class name. Default: the configured default encryptor.
+- **config** — Config alias to use (e.g. `default`, `personal_data`). If omitted, all configs are processed in turn.
 - **batchSize** — Number of entities to flush per batch (default: 20).
 
 Examples:
 
 ```bash
-php bin/console doctrine:decrypt:database Halite
-php bin/console doctrine:decrypt:database Defuse 50
+php bin/console doctrine:decrypt:database
+php bin/console doctrine:decrypt:database default 50
 ```
 
 ## Generate secret key
 
-Generate a new secret key file for the configured encryptor:
+Generates encryption key files for Halite and Defuse configs.
+
+**Without argument:** Checks all configs; creates a key file in each `secret_directory_path` when missing (Halite and Defuse only). Skips configs that already have a key file.
 
 ```bash
 php bin/console doctrine:encrypt:generate-secret-key
 ```
 
-Run this before first use if no key file exists, or when rotating keys.
+**With config argument:** Creates or overwrites the key for that config only. If the key file already exists, the command asks for confirmation before overwriting.
+
+```bash
+php bin/console doctrine:encrypt:generate-secret-key default
+php bin/console doctrine:encrypt:generate-secret-key personal_data
+```
+
+Run this before first use if no key file exists, or when rotating keys. Configs using a custom encryptor class are skipped (only Halite and Defuse keys are generated).
 
 For a full **key rotation** procedure (backup → decrypt → change keys → re-encrypt), see [Key rotation](KEY_ROTATION.md).

docs/COMMANDS.md

@@ -32,6 +32,13 @@
 
 ---
 
+## v2.0.5 (2026-02-20)
+
+- **Scope:** (1) GenerateSecretKeyCommand: support all configs (create missing Halite/Defuse keys); optional `config` argument with overwrite confirmation. (2) Rename test directory `Tests` → `tests`; update phpunit, composer autoload-dev, php-cs-fixer. (3) Keep symfony/var-exporter in require for LazyGhost; CI pin var-exporter ^7.4. (4) Makefile: validate and update targets; qa runs validate. (5) Docs: COMMANDS.md correct args (config) and generate-secret-key behaviour.
+- **Checklist:** CHANGELOG and UPGRADING updated; tag `v2.0.5` created and pushed.
+
+---
+
 ## v2.0.4 (2026-02-19)
 
 - **Scope:** (1) Fix PHPUnit unit tests (EncryptUtil, DecryptExtension) so they no longer mock the final class `EncryptorRegistry`; use real registry with mocked `EncryptorInterface` instead. Fixes test-coverage errors with PHPUnit 10/11. (2) Make `doctrine:encrypt:database` and `doctrine:decrypt:database` command `configure()` idempotent so arguments are only added when not already present; avoids "An argument with name config already exists" with Symfony Console 7/8.

docs/RELEASE.md

@@ -29,6 +29,19 @@ This guide explains how to upgrade the Doctrine Encrypt Bundle between versions.
 
 ---
 
+## Upgrading to 2.0.5
+
+No breaking changes. Update as usual:
+
+```bash
+composer update nowo-tech/doctrine-encrypt-bundle
+php bin/console cache:clear
+```
+
+If you run the test suite from the bundle source, ensure your autoload and PHPUnit config use the `tests/` directory (lowercase); the package already ships with this layout.
+
+---
+
 ## Upgrading to 2.0.4
 
 No breaking changes. Update as usual:

docs/UPGRADING.md

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Tests/bootstrap.php"
+<phpunit bootstrap="./tests/bootstrap.php"
          colors="true">
 
     <testsuites>
         <testsuite name="unit">
-            <directory suffix="Test.php">./Tests/Unit</directory>
+            <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
         <testsuite name="functional">
-            <directory suffix="Test.php">./Tests/Functional/BasicQueryTest</directory>
-            <directory suffix="TestCase.php">./Tests/Functional/DoctrineEncryptSubscriber</directory>
+            <directory suffix="Test.php">./tests/Functional/BasicQueryTest</directory>
+            <directory suffix="TestCase.php">./tests/Functional/DoctrineEncryptSubscriber</directory>
         </testsuite>
     </testsuites>
 
@@ -29,7 +29,7 @@
     </coverage>
 
     <php>
-        <env name="KERNEL_DIR" value="./Tests/Functional/Fixtures/app" />
+        <env name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
         <env name="KERNEL_CLASS" value="AppKernel" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
     </php>