Removing apparently redundant requirement for mcrypt.
This commit is contained in:
parent
9fda9ed989
commit
a2a89df4c0
|
@ -7,7 +7,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C300EE8C E5267A6C 0
|
|||
RUN apt-get update
|
||||
|
||||
# Install PHP:
|
||||
RUN apt-get install -qy git-core php5-common php5-cli php5-curl php5-imap php5-mcrypt php5-mysqlnd
|
||||
RUN apt-get install -qy git-core php5-common php5-cli php5-curl php5-imap php5-mysqlnd
|
||||
|
||||
# Give Git some fake user details to prevent it asking when trying to test merges:
|
||||
RUN git config --global user.name "PHPCI"
|
||||
|
|
|
@ -118,7 +118,7 @@ class InstallCommand extends Command
|
|||
}
|
||||
|
||||
// Check required extensions are present:
|
||||
$requiredExtensions = array('PDO', 'pdo_mysql', 'mcrypt');
|
||||
$requiredExtensions = array('PDO', 'pdo_mysql');
|
||||
|
||||
foreach ($requiredExtensions as $extension) {
|
||||
if (!extension_loaded($extension)) {
|
||||
|
|
|
@ -25,7 +25,6 @@ class PluginController extends \PHPCI\Controller
|
|||
{
|
||||
protected $required = array(
|
||||
'php',
|
||||
'ext-mcrypt',
|
||||
'ext-pdo',
|
||||
'ext-pdo_mysql',
|
||||
'block8/b8framework',
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
"require": {
|
||||
"php": ">=5.3.8",
|
||||
"ext-mcrypt": "*",
|
||||
"ext-pdo": "*",
|
||||
"ext-pdo_mysql": "*",
|
||||
"block8/b8framework": "~1.0",
|
||||
|
|
Loading…
Reference in a new issue