Merge pull request #77 from bogdanr/master

Added the readline PHP package and added support for installing PHP7 …

php/init.sls

@@ -4,6 +4,12 @@
 
 {% if grains['os_family']=="Debian" %}
 {% set use_ppa        = salt['pillar.get']('php:use_ppa', none) %}
+
+{% if (grains['oscodename']=="Jessie" and salt['pillar.get']('php:version')=="7.0") or salt['pillar.get']('php:use_dotdeb') %}
+include:
+  - php.dotdeb
+{% endif %}
+
 {% if use_ppa is not none %}
 
 {% set ppa_name        = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}
@@ -14,6 +20,7 @@ php54:
     pkg.latest:
         - name: php5
         - refresh: True
+
 {% endif %}
 {% endif %}
 

php/map.jinja

@@ -1,3 +1,34 @@
+{% if salt['pillar.get']('php:version')|string == '7.0' %}
+
+{% set php = salt['grains.filter_by']({
+    'Debian': {
+        'php_pkg': 'php7.0',
+        'apc_pkg': 'php7.0-apc',
+        'apcu_pkg': 'php7.0-apcu',
+        'cli_pkg': 'php7.0-cli',
+        'curl_pkg': 'php7.0-curl',
+        'fpm_pkg': 'php7.0-fpm',
+        'fpm_service': 'php7.0-fpm',
+        'gd_pkg': 'php7.0-gd',
+        'intl_pkg': 'php7.0-intl',
+        'json_pkg': 'php7.0-json',
+        'mcrypt_pkg': 'php7.0-mcrypt',
+        'memcache_pkg': 'php7.0-memcached',
+        'memcached_pkg': 'php7.0-memcached',
+        'mysql_pkg': 'php7.0-mysql',
+        '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',
+        'dev_pkg': 'php7.0-dev',
+        'php_ini': '/etc/php7.0/apache2/php.ini',
+    },
+}, merge=salt['pillar.get']('php:lookup')) %}
+
+{% else %}
+
 {% set php = salt['grains.filter_by']({
     'Debian': {
         'php_pkg': 'php5',
@@ -7,6 +38,7 @@
         'cli_pkg': 'php5-cli',
         'curl_pkg': 'php5-curl',
         'fpm_pkg': 'php5-fpm',
+        'fpm_service': 'php5-fpm',
         'gd_pkg': 'php5-gd',
         'oauth_pkg': 'php5-oauth',
         'intl_pkg': 'php5-intl',
@@ -19,10 +51,10 @@
         'mysql_pkg': 'php5-mysql',
         'mysqlnd_pkg': 'php5-mysqlnd',
         'pear_pkg': 'php-pear',
+        'readline_pkg': ' php5-readline',
         'soap_pkg': 'php-soap',
-      	'sqlite_pkg': 'php5-sqlite',
+        'sqlite_pkg': 'php5-sqlite',
         'redis_pkg': 'php5-redis',
-        'fpm_service': 'php5-fpm',
         'xml_pkg': 'php5',
         'imagick_pkg': 'php5-imagick',
         'suhosin_pkg': 'php5-suhosin',
@@ -59,8 +91,9 @@
         'mysql_pkg': 'php-mysql',
         'mysqlnd_pkg': 'php-mysqlnd',
         'pear_pkg': 'php-pear',
+        'readline_pkg': ' php-readline',
         'soap_pkg': 'php-soap',
-      	'sqlite_pkg': 'php5-sqlite',
+        'sqlite_pkg': 'php5-sqlite',
         'redis_pkg': 'php-redis',
         'fpm_service': 'php-fpm',
         'xml_pkg': 'php-xml',
@@ -92,6 +125,7 @@
         'mcrypt_pkg': 'php5-mcrypt',
         'mysql_pkg': 'php5-mysql',
         'pear_pkg': 'php5-pear',
+        'readline_pkg': ' php5-readline',
         'soap_pkg': 'php5-soap',
         'sqlite_pkg': 'php5-sqlite',
         'fpm_service': 'php5-fpm',
@@ -112,3 +146,5 @@
         'composer_hash': 'sha256=6a1ba6495f0bdb8e7735a7a76948b61c54b4a57b56837a9e9f93b4a0ac1f83a5',
     },
 }, merge=salt['pillar.get']('php:lookup')) %}
+
+{% endif %}

php/readline.sls

@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-readline:
+  pkg:
+    - installed
+    - name: {{ php.readline_pkg }}