From a99c2232f915875ff50d168b5e426a7be2589948 Mon Sep 17 00:00:00 2001
From: D Vargas <hiphipvargas@sapo.pt>
Date: Tue, 24 Sep 2019 10:01:08 +0200
Subject: [PATCH 1/2] OPENEUROPA-2258: Use PHP 7.2 in drone and docker image.

---
 .drone.yml              | 1 +
 docker-compose.yml.dist | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 3c8673e..bfda7f6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,6 +39,7 @@ matrix:
   IMAGE_PHP:
     - fpfis/httpd-php-dev:5.6
     - fpfis/httpd-php-dev:7.1
+    - fpfis/httpd-php-dev:7.2
   COMPOSER_BOUNDARY:
     - '--prefer-lowest'
     - ''
diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist
index d8de5f0..169fb7d 100644
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml.dist
@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.1
+    image: fpfis/httpd-php-dev:7.2
     working_dir: /var/www/html
     ports:
       - 8080:8080

From 32d9fda8b9e99cd2f6d8fc95d43f1bd1e5028204 Mon Sep 17 00:00:00 2001
From: D Vargas <hiphipvargas@sapo.pt>
Date: Tue, 24 Sep 2019 11:29:18 +0200
Subject: [PATCH 2/2] OPENEUROPA-2258: Require higher versions of packages for
 tests to pass.

---
 composer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8726d1b..a786aae 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,12 @@
         "openeuropa/code-review": "1.0.0-alpha1",
         "peridot-php/leo": "~1.6",
         "phpspec/phpspec": "~4.0@alpha",
-        "phpunit/phpunit": "~5.5|~6"
+        "phpunit/phpunit": "~5.5|~6",
+        "sebastian/comparator": ">1.2.3"
     },
+    "_readme": [
+        "We explicitly require cweagans/composer-patches to allow 'composer update --prefer-lowest' to complete successfully."
+    ],
     "suggest": {
         "monolog/monolog": "Log Poetry requests and responses via Monolog",
         "ec-europa/oe-poetry-behat": "Test Poetry service integration with Behat"