From 94c549cb278b04629c22584b462b6837d790affc Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 8 Jan 2019 19:56:15 +0100
Subject: [PATCH] Change default PHP version to 7.2 and add support for
PHP_VERSION environment variable
---
README.md | 6 +++---
composer.json | 2 +-
src/Handler.php | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 58ccdaf..67b252f 100644
--- a/README.md
+++ b/README.md
@@ -222,7 +222,7 @@ To overwrite the default settings for the Docker environment, add the relevant p
"version": 8
},
"php": {
- "version": "7.0",
+ "version": "7.2",
"xdebug": 1
},
"webserver": {
@@ -270,9 +270,9 @@ To overwrite the default settings for the Docker environment, add the relevant p
}
}
}
-```
-Other supported values for the PHP version are `5.3`, `5.6` and `7.1`.
+```
+Other supported values for the PHP version are `5.3`, `5.6`, `7.0` and `7.1`.
Other supported value for the webserver type is `nginx`.
diff --git a/composer.json b/composer.json
index 917a92e..c2ccb7f 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
"composer-plugin-api": "^1.0.0",
"lakedrops/composer-json-utils": "^1.4.2",
"lakedrops/docker-traefik": "^1.1.3",
- "lakedrops/dotenv": "^1.1.3",
+ "lakedrops/dotenv": "^1.2.2",
"twig/twig": "^1.23.1"
},
"require-dev": {
diff --git a/src/Handler.php b/src/Handler.php
index 3f40954..669d1a9 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -248,7 +248,7 @@ class Handler extends BaseHandler {
'version' => '8',
],
'php' => [
- 'version' => '7.0',
+ 'version' => $env->receiveGlobal('PHP_VERSION', 'PHP version', '7.2'),
'xdebug' => $this->isLocalDevMode() ? 1 : 0,
],
'webserver' => [
--
GitLab