From de96c787d5951d5fb8a9ec17da841adf25fa26b8 Mon Sep 17 00:00:00 2001
From: Alex Powell <alexjh.powell@googlemail.com>
Date: Wed, 1 Jun 2016 19:03:31 +0100
Subject: [PATCH] Fixing composer with php7. Fixing php7 pgsql package
 definition. Adding mbstring and sqlite package definitions for php7.

---
 php/map.jinja | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/php/map.jinja b/php/map.jinja
index 31ada9b..ea26523 100644
--- a/php/map.jinja
+++ b/php/map.jinja
@@ -16,15 +16,20 @@
         'memcache_pkg': 'php7.0-memcached',
         'memcached_pkg': 'php7.0-memcached',
         'mysql_pkg': 'php7.0-mysql',
+        'mbstring_pkg': 'php7.0-mbstring',
         'readline_pkg': ' php7.0-readline',
         'redis_pkg': 'php7.0-redis',
         'xml_pkg': 'php7.0-xml',
         'imagick_pkg': 'php7.0-imagick',
         'suhosin_pkg': 'php7.0-suhosin',
-        'pgsql_pkg': 'php5-pgsql',
+        'pgsql_pkg': 'php7.0-pgsql',
         'dev_pkg': 'php7.0-dev',
         'zip_pkg': 'php7.0-zip',
         'php_ini': '/etc/php7.0/apache2/php.ini',
+        'sqlite_pkg': 'php7.0-sqlite3',
+        'local_bin': '/usr/local/bin',
+        'temp_dir': '/tmp',
+        'composer_bin': 'composer',
     },
 }, merge=salt['pillar.get']('php:lookup')) %}