mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-30 09:20:58 +01:00
Require mysql or mysqli, not both
Summary: We use mysqli if it's available by default. Don't require installs to build with mysql. Test Plan: Applied to new secure.phabricator.com install. Reviewers: chad, vrana Reviewed By: chad CC: aran Differential Revision: https://secure.phabricator.com/D5194
This commit is contained in:
parent
dc8cc123da
commit
3f1a78450c
1 changed files with 4 additions and 2 deletions
|
@ -7,12 +7,10 @@ final class PhabricatorSetupCheckExtensions extends PhabricatorSetupCheck {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function executeChecks() {
|
protected function executeChecks() {
|
||||||
// TODO: Require 'mysql' OR 'mysqli'.
|
|
||||||
// TODO: Make 'mbstring' and 'iconv' soft requirements.
|
// TODO: Make 'mbstring' and 'iconv' soft requirements.
|
||||||
// TODO: Make 'curl' a soft requirement.
|
// TODO: Make 'curl' a soft requirement.
|
||||||
|
|
||||||
$required = array(
|
$required = array(
|
||||||
'mysql',
|
|
||||||
'hash',
|
'hash',
|
||||||
'json',
|
'json',
|
||||||
'openssl',
|
'openssl',
|
||||||
|
@ -32,6 +30,10 @@ final class PhabricatorSetupCheckExtensions extends PhabricatorSetupCheck {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!extension_loaded('mysqli') && !extension_loaded('mysql')) {
|
||||||
|
$need[] = 'mysqli or mysql';
|
||||||
|
}
|
||||||
|
|
||||||
if (!$need) {
|
if (!$need) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue