Merge pull request #1551 from oxyc/php72

Update php-versions role for PHP 7.2 support

Author: geerlingguy

default.config.yml

@@ -254,7 +254,7 @@ firewall_log_dropped_packets: false
 firewall_disable_firewalld: true
 firewall_disable_ufw: true
 
-# PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1.
+# PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1, 7.2.
 # See version-specific notes: http://docs.drupalvm.com/en/latest/configurations/php/
 php_version: "7.1"
 php_install_recommends: no

docs/configurations/php.md

@@ -1,19 +1,19 @@
-Drupal VM defaults to PHP 7.1, but you can also install and use 5.6 or 7.0.
+Drupal VM defaults to PHP 7.1, but you can also install and use 5.6, 7.0 or 7.2.
 
 ## Ubuntu
 
-Ondřej Surý's PPA for PHP is used to install PHP 7.1, but you can switch to using 5.6 or 7.0 packages by changing `php_version` inside `config.yml` to `"5.6"` or `"7.0"`.
+Ondřej Surý's PPA for PHP is used to install PHP 7.1, but you can switch version by changing `php_version` inside `config.yml` to `"5.6"`, `"7.0"` or `"7.2"`.
 
 If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` or `libapache2-mod-php7.0` to the `extra_packages` list.
 
-_Note: XHProf does currently not work with PHP 7.1, make sure you don't have it listed in `installed_extras`._
+_Note: XHProf does currently not work with PHP 7.1+, make sure you don't have it listed in `installed_extras`._
 
 ## RedHat/CentOS 7
 
-Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7.0 or PHP 5.6 instead of 7.1:
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.1:
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"5.6"` or `"7.0"`.
+  2. Change `php_version` inside `config.yml` to `"5.6"`, `"7.0"` or `"7.2"`.
 
 ## Using default distribution packages
 

docs/extras/xhprof.md

@@ -1,6 +1,6 @@
 [XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
 
-_Note: XHProf does currently not work with PHP 7.1. The PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. If you require support for PHP 7.1 you should use [Tideways](tideways.md) instead._
+_Note: XHProf does currently not work with PHP 7.1+. The PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. If you require support for PHP 7.1 or newer, you should use [Tideways](tideways.md) instead._
 
 ### XHProf module
 

provisioning/requirements.yml

@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 1.1.0
 - src: geerlingguy.php-versions
-  version: 1.1.0
+  version: 2.0.0
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof

provisioning/roles/geerlingguy.php-versions/.travis.yml

@@ -2,11 +2,33 @@
 services: docker
 
 env:
-  - distro: centos7
-  - distro: centos6
-  - distro: debian8
-  - distro: ubuntu1604
-  - distro: ubuntu1404
+  global:
+    php_version: "7.1"
+
+  matrix:
+    # Default - PHP 7.1
+    - distro: centos7
+    - distro: centos6
+    - distro: debian8
+    - distro: ubuntu1604
+    - distro: ubuntu1404
+
+    # PHP 7.2
+    - distro: centos7
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: centos6
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: debian8
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: ubuntu1604
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: ubuntu1404
+      playbook: test-7.2.yml
+      php_version: "7.2"
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
@@ -21,7 +43,7 @@ script:
   - ${PWD}/tests/test.sh
 
   # Run script to test PHP version.
-  - 'docker exec ${container_id} env TERM=xterm php -v | grep "7.1."'
+  - 'docker exec ${container_id} env TERM=xterm php -v | grep -F "${php_version}."'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

provisioning/roles/geerlingguy.php-versions/README.md

@@ -26,7 +26,7 @@ The PHP version to be installed. Any [currently-supported PHP major version](htt
     - hosts: webservers
 
       vars:
-        php_version: 7.1
+        php_version: '7.1'
 
       roles:
         - role: geerlingguy.repo-remi

provisioning/roles/geerlingguy.php-versions/tasks/main.yml

@@ -1,6 +1,9 @@
 ---
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ item }}"
+  with_fileglob:
+    - "../vars/{{ ansible_os_family }}.yml"
+    - "../vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
 
 - name: Define PHP variables.
   set_fact: "{{ item.key }}={{ hostvars[inventory_hostname][item.value] }}"

provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml

@@ -45,7 +45,8 @@
     purge: yes
     force: yes
   when: "'php' + php_version not in item"
-  with_flattened:
-    - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
-    - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"
-    - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
+  with_items:
+    - php5.6-common
+    - php7.0-common
+    - php7.1-common
+    - php7.2-common

provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml

@@ -10,3 +10,7 @@
 - name: Enable remi repo for PHP 7.1.
   set_fact: php_enablerepo="remi,remi-php71"
   when: php_version == "7.1"
+
+- name: Enable remi repo for PHP 7.2.
+  set_fact: php_enablerepo="remi,remi-php72"
+  when: php_version == "7.2"

provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml

@@ -0,0 +1,17 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_version: "7.2"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role_under_test
+    - geerlingguy.php