From 87fe9bd2ff850e15a02b44405e82c9bb8f27ae17 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 10:50:05 +0100
Subject: [PATCH] Adjust the web wizard so that all database dependencies are
 grouped

refs #8508
---
 modules/setup/library/Setup/WebWizard.php | 33 ++++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 667237243..6158d9bd0 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -447,28 +447,17 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $mysqlRequirements = new Requirements();
+        $mysqlRequirements->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'mysql',
             'alias'         => 'PDO-MySQL',
             'description'   => mt(
                 'setup',
-                'Is Icinga Web 2 supposed to access a MySQL database the PDO-MySQL module for PHP is required.'
+                'To store users or preferences in a MySQL database the PDO-MySQL module for PHP is required.'
             )
         )));
-
-        $requirements->add(new PhpModuleRequirement(array(
-            'optional'      => true,
-            'condition'     => 'pgsql',
-            'alias'         => 'PDO-PostgreSQL',
-            'description'   => mt(
-                'setup',
-                'Is Icinga Web 2 supposed to access a PostgreSQL database'
-                . ' the PDO-PostgreSQL module for PHP is required.'
-            )
-        )));
-
-        $requirements->add(new ClassRequirement(array(
+        $mysqlRequirements->add(new ClassRequirement(array(
             'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Mysql',
             'alias'         => mt('setup', 'Zend database adapter for MySQL'),
@@ -477,8 +466,19 @@ class WebWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for MySQL is required to access a MySQL database.'
             )
         )));
+        $requirements->merge($mysqlRequirements);
 
-        $requirements->add(new ClassRequirement(array(
+        $pgsqlRequirements = new Requirements();
+        $pgsqlRequirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'pgsql',
+            'alias'         => 'PDO-PostgreSQL',
+            'description'   => mt(
+                'setup',
+                'To store users or preferences in a PostgreSQL database the PDO-PostgreSQL module for PHP is required.'
+            )
+        )));
+        $pgsqlRequirements->add(new ClassRequirement(array(
             'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Pgsql',
             'alias'         => mt('setup', 'Zend database adapter for PostgreSQL'),
@@ -487,6 +487,7 @@ class WebWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
             )
         )));
+        $requirements->merge($pgsqlRequirements);
 
         $requirements->add(new ConfigDirectoryRequirement(array(
             'condition'     => Icinga::app()->getConfigDir(),