From 206498ba0cfc4287a5af6c34c57b673675544585 Mon Sep 17 00:00:00 2001
From: Daniel Lerch <daniel.p.lerch@gmail.com>
Date: Tue, 28 Jul 2020 22:45:47 +0200
Subject: [PATCH] Install missing PHP module gettext

---
 Dockerfile                      | 10 ++++++----
 composer.json                   |  9 +++++++++
 composer.lock                   | 12 ++++++++++--
 install/default/php-windows.ini |  1 +
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 24fc3c7..ae1478d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,14 +10,16 @@ RUN set -x \
         libc-client-dev libkrb5-dev libpng-dev libjpeg-dev \
     && rm -rf /var/lib/apt/list/* \
 # Install PHP extensions
+    && docker-php-ext-configure gd --with-jpeg-dir=/usr/include \
+    && docker-php-ext-install gd \
+    && docker-php-ext-configure gettext \
+    && docker-php-ext-install gettext \
+    && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && docker-php-ext-install imap \
     && docker-php-ext-configure mysqli \
     && docker-php-ext-install mysqli \
     && docker-php-ext-configure zip \
     && docker-php-ext-install zip \
-    && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install imap \
-    && docker-php-ext-configure gd --with-jpeg-dir=/usr/include \
-    && docker-php-ext-install gd \
 # Configure environment
     && a2enmod rewrite \
     && sed -i \
diff --git a/composer.json b/composer.json
index 8e320d7..d8f72e4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,6 @@
 {
+    "name": "daniel-lerch/openkool",
+    "description": "Open source fork of kOOL - Online church organization tool",
     "require-dev": {
         "behat/behat": "^3.4",
         "behat/mink-extension": "^2.0",
@@ -13,6 +15,13 @@
         }
     },
     "require": {
+        "php": ">=7.1.0",
+        "ext-gd": "*",
+        "ext-gettext": "*",
+        "ext-imap": "*",
+        "ext-mbstring": "*",
+        "ext-mysqli": "*",
+        "ext-openssl": "*",
         "phpseclib/phpseclib": "~2.0",
         "phpoffice/phpspreadsheet": "^1.6",
         "smarty/smarty": "2.6.*"
diff --git a/composer.lock b/composer.lock
index eb12040..30e3810 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "77771edd44dd6dce7fc63cae1f6efadb",
+    "content-hash": "8002e48c865cbc89dfc2e15fc6111c8a",
     "packages": [
         {
             "name": "markbaker/complex",
@@ -2865,6 +2865,14 @@
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "php": ">=7.1.0",
+        "ext-gd": "*",
+        "ext-gettext": "*",
+        "ext-imap": "*",
+        "ext-mbstring": "*",
+        "ext-mysqli": "*",
+        "ext-openssl": "*"
+    },
     "platform-dev": []
 }
diff --git a/install/default/php-windows.ini b/install/default/php-windows.ini
index 04ee388..fd2f7bc 100644
--- a/install/default/php-windows.ini
+++ b/install/default/php-windows.ini
@@ -5,6 +5,7 @@ extension_dir = "" ; Insert your PHP extension directory
 extension = php_curl.dll
 extension = php_fileinfo.dll
 extension = php_gd2.dll
+extension = php_gettext.dll
 extension = php_imap.dll
 extension = php_mbstring.dll
 extension = php_mysqli.dll