From bbc5f6a43d8b4ec30e70772f0087969e06286620 Mon Sep 17 00:00:00 2001
From: Meritoo <github@meritoo.pl>
Date: Sat, 10 Sep 2022 13:02:02 +0200
Subject: [PATCH] Bump PHP version to 7.4 (from 7.2)

---
 composer.json      | 2 +-
 docker-compose.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 93eaba0..45a63f6 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.4",
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-intl": "*",
diff --git a/docker-compose.yml b/docker-compose.yml
index d725bfa..98a0357 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     # Required to run project
     #
     php:
-        image: meritoo/php
+        image: meritoo/php:7.4
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-php
         entrypoint: php
         command: -S 0.0.0.0:9999
@@ -14,7 +14,7 @@ services:
         volumes:
             - .:/var/www/application:cached
     composer:
-        image: meritoo/php
+        image: meritoo/php:7.4
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-composer
         entrypoint: php -d memory_limit=-1 /usr/local/bin/composer
         volumes:
@@ -23,7 +23,7 @@ services:
     # Required to run PHPUnit's tests
     #
     phpunit:
-        image: meritoo/php
+        image: meritoo/php:7.4
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-phpunit
         entrypoint: ./vendor/bin/phpunit
         command: --version