tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-24 22:34:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

WebWizard: Remove Zend_Db_* class requirements

Browse Source 
All of our packages (even debian) roll out our own
bundled fork, which containes these classes.
This commit is contained in:
Johannes Meyer 2021-06-22 12:33:15 +02:00
parent f72a5fbe89
commit 3b3eca934f
1 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
modules/setup/library/Setup/WebWizard.php
View File

@ -32,8 +32,6 @@ use Icinga\Module\Setup\Steps\UserGroupStep;
use Icinga\Module\Setup\Utils\EnableModuleStep; use Icinga\Module\Setup\Utils\EnableModuleStep;
use Icinga\Module\Setup\Utils\DbTool; use Icinga\Module\Setup\Utils\DbTool;
use Icinga\Module\Setup\Requirement\OSRequirement; use Icinga\Module\Setup\Requirement\OSRequirement;
use Icinga\Module\Setup\Requirement\ClassRequirement;
use Icinga\Module\Setup\Requirement\PhpConfigRequirement;
use Icinga\Module\Setup\Requirement\PhpModuleRequirement; use Icinga\Module\Setup\Requirement\PhpModuleRequirement;
use Icinga\Module\Setup\Requirement\PhpVersionRequirement; use Icinga\Module\Setup\Requirement\PhpVersionRequirement;
use Icinga\Module\Setup\Requirement\ConfigDirectoryRequirement; use Icinga\Module\Setup\Requirement\ConfigDirectoryRequirement;
@ -649,9 +647,7 @@ class WebWizard extends Wizard implements SetupWizard
))); )));
$dbSet = new RequirementSet(false, RequirementSet::MODE_OR); $dbSet = new RequirementSet(false, RequirementSet::MODE_OR);
$dbSet->add(new PhpModuleRequirement(array(
$mysqlSet = new RequirementSet(true);
$mysqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
'condition' => 'pdo_mysql', 'condition' => 'pdo_mysql',
'alias' => 'PDO-MySQL', 'alias' => 'PDO-MySQL',
@ -660,30 +656,7 @@ class WebWizard extends Wizard implements SetupWizard
'To store users or preferences in 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.'
) )
))); )));
$mysqlSet->add(new ClassRequirement(array( $dbSet->add(new PhpModuleRequirement(array(
'optional' => true,
'condition' => 'Zend_Db_Adapter_Pdo_Mysql',
'alias' => mt('setup', 'Zend database adapter for MySQL'),
'description' => mt(
'setup',
'The Zend database adapter for MySQL is required to access a MySQL database.'
),
'textAvailable' => mt(
'setup',
'The Zend database adapter for MySQL is available.',
'setup.requirement.class'
),
'textMissing' => mt(
'setup',
'The Zend database adapter for MySQL is missing.',
'setup.requirement.class'
)
)));
$dbSet->merge($mysqlSet);
$pgsqlSet = new RequirementSet(true);
$pgsqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
'condition' => 'pdo_pgsql', 'condition' => 'pdo_pgsql',
'alias' => 'PDO-PostgreSQL', 'alias' => 'PDO-PostgreSQL',
@ -692,26 +665,6 @@ class WebWizard extends Wizard implements SetupWizard
'To store users or preferences in a PostgreSQL database the PDO-PostgreSQL module for PHP is required.' 'To store users or preferences in a PostgreSQL database the PDO-PostgreSQL module for PHP is required.'
) )
))); )));
$pgsqlSet->add(new ClassRequirement(array(
'optional' => true,
'condition' => 'Zend_Db_Adapter_Pdo_Pgsql',
'alias' => mt('setup', 'Zend database adapter for PostgreSQL'),
'description' => mt(
'setup',
'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
),
'textAvailable' => mt(
'setup',
'The Zend database adapter for PostgreSQL is available.',
'setup.requirement.class'
),
'textMissing' => mt(
'setup',
'The Zend database adapter for PostgreSQL is missing.',
'setup.requirement.class'
)
)));
$dbSet->merge($pgsqlSet);
$set->merge($dbSet); $set->merge($dbSet);
$dbRequire = (new SetRequirement(array( $dbRequire = (new SetRequirement(array(