From d727b15557e2223cd82fe5fde0bc16365e20ebb8 Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <aw@sz9i.net>
Date: Sun, 8 Nov 2020 22:10:03 +0100
Subject: [PATCH] feat(composer): make dependencies configurable

---
 php/composer.sls | 11 +++--------
 php/map.jinja    |  9 +++++++++
 pillar.example   | 10 ++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/php/composer.sls b/php/composer.sls
index 9640537..95537b2 100644
--- a/php/composer.sls
+++ b/php/composer.sls
@@ -12,14 +12,9 @@
 
 include:
   - php
-{% if grains['os_family'] == 'FreeBSD' %}
-  - php.filter
-  - php.hash
-  - php.json
-  - php.mbstring
-  - php.openssl
-  - php.phar
-{% endif %}
+{%- for module in php.lookup.get('composer', {}).get('required_modules', []) %}
+  - php.{{ module }}
+{%- endfor %}
 
 get-composer:
   file.managed:
diff --git a/php/map.jinja b/php/map.jinja
index 516659d..66e2a93 100644
--- a/php/map.jinja
+++ b/php/map.jinja
@@ -3102,6 +3102,15 @@
                 'cli': {
                     'ini': '/usr/local/etc/php.ini'
                 },
+                'composer': {
+                    'required_modules': [
+                      'filter',
+                      'json',
+                      'mbstring',
+                      'openssl',
+                      'phar',
+                    ],
+                },
                 'pkgs': {
                     'apache2': 'mod_php' + freebsd_php_version,
                     'composer_bin': 'composer',
diff --git a/pillar.example b/pillar.example
index 73a1909..9676769 100644
--- a/pillar.example
+++ b/pillar.example
@@ -74,6 +74,16 @@ php:
     cli:
       ini: /location/of/php-cli/php.ini
 
+    # php.composer
+    # Some OS need modules to be installed
+    composer:
+      required_modules:
+        - filter
+        - json
+        - mbstring
+        - openssl
+        - phar
+
   # php-fpm settings
   fpm: