From 06830367c961aa2d38b1f1e9232350d94c4c0169 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 5 Jan 2020 15:26:56 +0100 Subject: [PATCH 1/2] Fixes #662 Update to latest Symfony CLI --- .devilbox/www/config.php | 4 ++-- CHANGELOG.md | 6 ++++++ docker-compose.yml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index 30ab1a9f..af238bc6 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -13,8 +13,8 @@ error_reporting(-1); putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); -$DEVILBOX_VERSION = 'v1.6.0'; -$DEVILBOX_DATE = '2020-01-04'; +$DEVILBOX_VERSION = 'v1.6.1'; +$DEVILBOX_DATE = '2020-01-05'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/CHANGELOG.md b/CHANGELOG.md index eb428591..49e72880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ major versions. ## Unreleased +## Bugfix Release v1.6.1 (2019-01-05) + +#### Fixed +- [#662](https://github.com/cytopia/devilbox/issues/662) Update to latest Symfony CLI + + ## Release v1.6.0 (2020-01-04) #### Changed diff --git a/docker-compose.yml b/docker-compose.yml index 9adfb334..c9aa52b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.100 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.101 hostname: php ## From ed8639c636006728b8ff8872ef4e36d66e46bd8d Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 5 Jan 2020 17:18:07 +0100 Subject: [PATCH 2/2] Refs #662 Fix Symfony version display on Devilbox intranet --- .devilbox/www/include/lib/container/Php.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devilbox/www/include/lib/container/Php.php b/.devilbox/www/include/lib/container/Php.php index 894d6a8d..44d357d5 100644 --- a/.devilbox/www/include/lib/container/Php.php +++ b/.devilbox/www/include/lib/container/Php.php @@ -82,7 +82,7 @@ class Php extends BaseClass implements BaseInterface } public function getSymfonyVersion() { - $output = loadClass('Helper')->exec('symfony --version 2>/dev/null', $output); + $output = loadClass('Helper')->exec('symfony -V 2>/dev/null | tr -d "[:cntrl:]" | sed "s/\[[0-9]*m//g"', $output); return loadClass('Helper')->egrep('/[0-9.]+/', $output); } public function getWpcliVersion()