OPENEUROPA-2943: Upgrade to PHP 7.3.

openeuropa · Mar 20, 2020 · bab3052 · bab3052
1 parent 5140d70
commit bab3052
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git 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
@@ -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",

diff --git 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