Skip to content
Snippets Groups Projects
Commit 7b0ef1e2 authored by jurgenhaas's avatar jurgenhaas
Browse files

Undo last change which was just wrong and change PHP default to 7.3

parent 6f71ebed
No related branches found
Tags v3.7.40
No related merge requests found
...@@ -227,7 +227,7 @@ class Handler extends BaseHandler { ...@@ -227,7 +227,7 @@ class Handler extends BaseHandler {
$env->put('COMPOSE_PROJECT_NAME', $projectname); $env->put('COMPOSE_PROJECT_NAME', $projectname);
} }
$extra = $this->composer->getPackage()->getExtra() + ['docker4drupal' => []]; $extra = $this->composer->getPackage()->getExtra() + ['docker4drupal' => []];
$options = NestedArray::mergeDeep($extra['docker4drupal'], [ $options = NestedArray::mergeDeep([
'projectname' => $projectname, 'projectname' => $projectname,
'ci_home' => '/home/gitlab-runner', 'ci_home' => '/home/gitlab-runner',
'docker0' => [ 'docker0' => [
...@@ -263,7 +263,7 @@ class Handler extends BaseHandler { ...@@ -263,7 +263,7 @@ class Handler extends BaseHandler {
'version' => '8', 'version' => '8',
], ],
'php' => [ 'php' => [
'version' => $env->receiveGlobal('PHP_VERSION', 'PHP version', '7.2'), 'version' => $env->receiveGlobal('PHP_VERSION', 'PHP version', '7.3'),
'xdebug' => $env->receiveGlobal('PHP_DEBUG', 'PHP debug', '0'), 'xdebug' => $env->receiveGlobal('PHP_DEBUG', 'PHP debug', '0'),
], ],
'webserver' => [ 'webserver' => [
...@@ -309,7 +309,7 @@ class Handler extends BaseHandler { ...@@ -309,7 +309,7 @@ class Handler extends BaseHandler {
'wkhtmltox' => [ 'wkhtmltox' => [
'enable' => 0, 'enable' => 0,
], ],
]); ], $extra['docker4drupal']);
if ($this->isCiContext() || $this->isLocalDevMode()) { if ($this->isCiContext() || $this->isLocalDevMode()) {
$projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR')); $projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR'));
...@@ -329,7 +329,7 @@ class Handler extends BaseHandler { ...@@ -329,7 +329,7 @@ class Handler extends BaseHandler {
$options['projectroot'] = $projectRoot; $options['projectroot'] = $projectRoot;
$this->options = $env->replaceEnvironmentVariables($options); $this->options = $env->replaceEnvironmentVariables($options);
$env->put('PHP_VERSION', $this->options['php']['version'], TRUE); $env->put('PHP_VERSION', $this->options['php']['version'], TRUE);
} }
if ($key !== NULL) { if ($key !== NULL) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment