Issue #241 - Symfony - Fix DbToolsExtension default config - remove env var processing (#257)

Author: SimonMellerin

src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php

@@ -30,17 +30,17 @@ public function load(array $configs, ContainerBuilder $container): void
         $configDef = new Definition();
         $configDef->setClass(Configuration::class);
         $configDef->setArguments([
-            '$backupBinary' => $config['backup_binary'] ?? '%env(resolve:DBTOOLS_BACKUP_BINARY)%',
-            '$backupExcludedTables' => $config['backup_excluded_tables'] ?? null, // new Parameter('env(resolve:array:DBTOOLS_BACKUP_EXCLUDED_TABLES)'), // @todo
-            '$backupExpirationAge' => $config['backup_expiration_age'] ?? '%env(resolve:string:DBTOOLS_BACKUP_EXPIRATION_AGE)%',
-            '$backupOptions' => $config['backup_options'] ?? '%env(resolve:DBTOOLS_BACKUP_OPTIONS)%',
-            '$backupTimeout' => $config['backup_timeout'] ?? '%env(int:DBTOOLS_BACKUP_TIMEOUT)%',
+            '$backupBinary' => $config['backup_binary'] ?? null,
+            '$backupExcludedTables' => $config['backup_excluded_tables'] ?? null,
+            '$backupExpirationAge' => $config['backup_expiration_age'] ?? null,
+            '$backupOptions' => $config['backup_options'] ?? null,
+            '$backupTimeout' => $config['backup_timeout'] ?? null,
             '$parent' => null, // For Symfony 6.x.
-            '$restoreBinary' => $config['restore_binary'] ?? '%env(resolve:DBTOOLS_RESTORE_BINARY)%',
-            '$restoreOptions' => $config['restore_options'] ?? '%env(resolve:DBTOOLS_RESTORE_OPTIONS)%',
-            '$restoreTimeout' => $config['restore_timeout'] ?? '%env(int:DBTOOLS_RESTORE_TIMEOUT)%',
-            '$storageDirectory' => $config['storage_directory'] ?? '%env(resolve:DBTOOLS_STORAGE_DIRECTORY)%',
-            '$storageFilenameStrategy' => $config['storage_filename_strategy'] ?? '%env(resolve:DBTOOLS_STORAGE_FILENAME_STRATEGY)%',
+            '$restoreBinary' => $config['restore_binary'] ?? null,
+            '$restoreOptions' => $config['restore_options'] ?? null,
+            '$restoreTimeout' => $config['restore_timeout'] ?? null,
+            '$storageDirectory' => $config['storage_directory'] ?? null,
+            '$storageFilenameStrategy' => $config['storage_filename_strategy'] ?? null,
         ]);
         $container->setDefinition('db_tools.configuration.default', $configDef);
 

tests/Unit/Bridge/Symfony/DependencyInjection/DbToolsExtensionTest.php

@@ -119,32 +119,6 @@ public function testEnvVarAreOverridenByConfiguration(array $config): void
         self::assertSame(__DIR__ . '/var/db_tools', $defaultConfig->getStorageDirectory());
     }
 
-    #[DependsExternal(DbToolsConfigurationTest::class, 'testConfigurationEmpty')]
-    public function testEnvVarArePropagated(array $config): void
-    {
-        $this->setAllDbToolsEnv();
-
-        $extension = new DbToolsExtension();
-        $extension->load([$config], $container = $this->getContainer());
-        $container->getDefinition('db_tools.configuration.registry')->setPublic(true);
-        $container->compile(true);
-
-        $configRegistry = $container->get('db_tools.configuration.registry');
-        \assert($configRegistry instanceof ConfigurationRegistry);
-        $defaultConfig = $configRegistry->getDefaultConfig();
-
-        // @todo missing excluded tables and default connection.
-        self::assertSame('/usr/bin/fromenv-backup', $defaultConfig->getBackupBinary());
-        self::assertSame('3 weeks', $defaultConfig->getBackupExpirationAge());
-        self::assertSame('--from-env-backup', $defaultConfig->getBackupOptions());
-        self::assertSame(666, $defaultConfig->getBackupTimeout());
-        self::assertSame('/usr/bin/fromenv-restore', $defaultConfig->getRestoreBinary());
-        self::assertSame('--from-env-restore', $defaultConfig->getRestoreOptions());
-        self::assertSame(999, $defaultConfig->getRestoreTimeout());
-        self::assertSame('fromenv_strategy', $defaultConfig->getStorageFilenameStrategy());
-        self::assertSame('/fromenv/storage', $defaultConfig->getStorageDirectory());
-    }
-
     #[DependsExternal(DbToolsConfigurationTest::class, 'testConfigurationConnectionsPartial')]
     public function testConnectionResolveParentForNonSetValues(array $config): void
     {