deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixes for feedback in #341.

Browse source
This commit is contained in:
Dan Cryer 2014-04-16 09:29:01 +01:00
commit 5eee1d6704
2 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

47
PHPCI/Command/InstallCommand.php
View file

@ -121,36 +121,26 @@ class InstallCommand extends Command
$errors = true;
}
// Check for required extensions:
if (!extension_loaded('PDO')) {
$output->writeln('');
$output->writeln('<error>PDO extension must be installed.</error>');
$errors = true;
// Check required extensions are present:
$requiredExtensions = array('PDO', 'pdo_mysql', 'mcrypt');
foreach ($requiredExtensions as $extension) {
if (!extension_loaded($extension)) {
$output->writeln('');
$output->writeln('<error>'.$extension.' extension must be installed.</error>');
$errors = true;
}
}
if (!extension_loaded('pdo_mysql')) {
$output->writeln('');
$output->writeln('<error>PDO MySQL extension must be installed.</error>');
$errors = true;
}
// Check required functions are callable:
$requiredFunctions = array('exec', 'shell_exec');
if (!extension_loaded('mcrypt')) {
$output->writeln('');
$output->writeln('<error>Mcrypt extension must be installed.</error>');
$errors = true;
}
// Check we can use the exec() and shell_exec() functions:
if (!function_exists('exec')) {
$output->writeln('');
$output->writeln('<error>PHPCI needs to be able to call the exec() function. Is it disabled in php.ini?</error>');
$errors = true;
}
if (!function_exists('shell_exec')) {
$output->writeln('');
$output->writeln('<error>PHPCI needs to be able to call the shell_exec() function. Is it disabled in php.ini?</error>');
$errors = true;
foreach ($requiredFunctions as $function) {
if (!function_exists($function)) {
$output->writeln('');
$output->writeln('<error>PHPCI needs to be able to call the '.$function.'() function. Is it disabled in php.ini?</error>');
$errors = true;
}
}
if (!function_exists('password_hash')) {
@ -160,8 +150,7 @@ class InstallCommand extends Command
}
if ($errors) {
$output->writeln('');
die;
throw new Exception('PHPCI cannot be installed, as not all requirements are met. Please review the errors above before continuing.');
}
$output->writeln(' <info>OK</info>');

4
composer.json
View file

@ -23,6 +23,10 @@
},
"require": {
"php": ">=5.3.3",
"ext-mcrypt": "*",
"ext-pdo": "*",
"ext-pdo_mysql": "*",
"block8/b8framework" : "1.*",
"ircmaxell/password-compat": "1.*",
"swiftmailer/swiftmailer" : "5.0.*",