Better check for invalid config (#41)

* Better check for invalid config

* Added changelog

Author: Nyholm

Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.1.1
+
+### Fixed
+
+- Allow to only use "dsn" without configure "type". 
+- Add better error message when both "dsn" and "type" is missing. 
+
 ## 2.1.0
 
 ### Added

DependencyInjection/Configuration.php

@@ -62,7 +62,14 @@ public function getConfigTreeBuilder()
                     ->validate()
                         ->ifTrue(function ($databases) {
                             $valid = true;
-                            foreach ($databases as $d) {
+                            foreach ($databases as $name => $d) {
+                                if (isset($d['dsn'])) {
+                                    // "Fake" "type" for now.
+                                    $d['type'] = substr($d['dsn'], 0, strpos($d['dsn'], ':'));
+                                }
+                                if (!isset($d['type'])) {
+                                    throw new InvalidConfigurationException(sprintf('You must define a "type" or "dsn" for database "%s"', $name));
+                                }
                                 if ($d['type'] !== 'mysql') {
                                     // If not "mysql" we have to make sure these parameter are set to default
                                     $valid = $valid && empty($d['ignoreTables']) && empty($d['ssl']) && empty($d['singleTransaction']);

Tests/Unit/DependencyInjection/BMBackupManagerExtensionTest.php

@@ -33,7 +33,6 @@ public function testReplacementOfConfig()
         $this->assertContainerBuilderHasServiceDefinitionWithArgument('backup_manager.config_database', 0, $dbConfig);
     }
 
-
     public function testDsn()
     {
         $storageConfig = ['local'=>['type'=>'Local', 'root'=>'/foo']];

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -134,4 +134,33 @@ public function testSingleTransactionOnValid()
             )
         );
     }
+
+    public function testDsn()
+    {
+        $this->assertConfigurationIsInvalid(array(
+                [
+                    'database'=>[
+                        'dev'=>[
+                            'dsn' => 'pgsql://root:[email protected]:5432/test_db',
+                            'singleTransaction' => true,
+                        ],
+                    ],
+                ]
+            )
+        );
+    }
+    public function testNoType()
+    {
+        $this->assertConfigurationIsInvalid(array(
+                [
+                    'database'=>[
+                        'dev'=>[
+
+                        ],
+                    ],
+                ]
+            ),
+            'You must define a "type" or "dsn" for database "dev"'
+        );
+    }
 }