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