From a85aa5bef160f181408fc8b9b20bcba3197ecfd8 Mon Sep 17 00:00:00 2001
From: Sergii Pavlenko <sergii.pavlenko.v@gmail.com>
Date: Fri, 20 Mar 2020 11:50:23 +0100
Subject: [PATCH] OPENEUROPA-2943: Upgrade to PHP 7.3.

---
 .drone.yml         | 20 ++++++++++----------
 composer.json      |  3 ++-
 docker-compose.yml |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1ea29535..297bb062 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,14 +4,14 @@ workspace:
 
 services:
   web:
-    image: ${IMAGE_PHP=fpfis/httpd-php-ci:5.6}
+    image: fpfis/httpd-php-ci:${PHP_VERSION}
     environment:
     - DOCUMENT_ROOT=/test/task-runner
 
 pipeline:
   composer-install-lowest:
     group: prepare
-    image: ${IMAGE_PHP=fpfis/httpd-php-ci:5.6}
+    image: fpfis/httpd-php-ci:${PHP_VERSION}
     volumes:
     - /cache:/cache
     commands:
@@ -25,7 +25,7 @@ pipeline:
 
   composer-install-highest:
     group: prepare
-    image: ${IMAGE_PHP=fpfis/httpd-php-ci:5.6}
+    image: fpfis/httpd-php-ci:${PHP_VERSION}
     volumes:
     - /cache:/cache
     commands:
@@ -36,20 +36,20 @@ pipeline:
 
   grumphp:
     group: test
-    image: ${IMAGE_PHP=fpfis/httpd-php-ci:5.6}
+    image: fpfis/httpd-php-ci:${PHP_VERSION}
     commands:
     - ./vendor/bin/grumphp run
 
   phpunit:
     group: test
-    image: ${IMAGE_PHP=fpfis/httpd-php-ci:5.6}
+    image: fpfis/httpd-php-ci:${PHP_VERSION}
     commands:
     - ./vendor/bin/phpunit
 
 matrix:
-  IMAGE_PHP:
-  - fpfis/httpd-php-ci:5.6
-  - fpfis/httpd-php-ci:7.1
+  PHP_VERSION:
+    - 7.2
+    - 7.3
   COMPOSER_BOUNDARY:
-  - lowest
-  - highest
+    - lowest
+    - highest
diff --git a/composer.json b/composer.json
index 11402243..a9aa9740 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
+        "php": "~7.2.0 || ~7.3.0",
         "consolidation/robo": "^1.4",
         "gitonomy/gitlib": "^1.0",
         "jakeasmith/http_build_url": "^1.0.1",
@@ -14,7 +15,7 @@
     },
     "require-dev": {
         "openeuropa/code-review": "~1.0.0-beta3",
-        "phpunit/phpunit": "~5.5||~6.0"
+        "phpunit/phpunit": "~6.0||~7.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/docker-compose.yml b/docker-compose.yml
index d8de5f0e..13575c4f 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.1
+    image: fpfis/httpd-php-dev:7.3
     working_dir: /var/www/html
     ports:
       - 8080:8080