Updated PHP role to latest version.

Author: geerlingguy

provisioning/requirements.yml

@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.1.2
 - src: geerlingguy.php
-  version: 3.4.5
+  version: 3.5.0
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql

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

@@ -18,17 +18,14 @@ env:
   - distro: ubuntu1404
     playbook: test.yml
     php_version: 7.0
-  - distro: ubuntu1204
-    playbook: test.yml
-    php_version: 5.6
 
   # Only test source install on latest supported OSes.
   - distro: centos7
     playbook: test-source.yml
-    php_version: 7.0.13
+    php_version: 7.1.9
   - distro: ubuntu1604
     playbook: test-source.yml
-    php_version: 7.0.13
+    php_version: 7.1.9
 
 script:
   # Configure test script so we can run extra tests after playbook is run.

provisioning/roles/geerlingguy.php/defaults/main.yml

@@ -25,7 +25,7 @@ php_fpm_pm_max_spare_servers: 5
 # The executable to run when calling PHP from the command line.
 php_executable: "php"
 
-# OpCache settings (useful for PHP >=5.5).
+# OpCache settings.
 php_opcache_zend_extension: "opcache.so"
 php_opcache_enable: "1"
 php_opcache_enable_cli: "0"
@@ -81,6 +81,7 @@ php_display_startup_errors: "Off"
 
 # Install PHP from source (instead of using a package manager) with these vars.
 php_install_from_source: false
+php_source_repo: "https://git.php.net/repository/php-src.git"
 php_source_version: "master"
 php_source_clone_dir: "~/php-src"
 php_source_clone_depth: 1

provisioning/roles/geerlingguy.php/meta/main.yml

@@ -20,7 +20,15 @@ galaxy_info:
     - all
   - name: Ubuntu
     versions:
-    - all
+    - trusty
+    - xenial
   galaxy_tags:
     - development
     - web
+    - php
+    - language
+    - fpm
+    - drupal
+    - wordpress
+    - joomla
+    - magento

provisioning/roles/geerlingguy.php/tasks/install-from-source.yml

@@ -78,31 +78,31 @@
 
 - name: Clone the PHP repository.
   git:
-    repo: https://git.php.net/repository/php-src.git
+    repo: "{{ php_source_repo }}"
     dest: "{{ php_source_clone_dir }}"
     version: "{{ php_source_version }}"
     accept_hostkey: yes
     depth: "{{ php_source_clone_depth }}"
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Ensure PHP installation path exists.
   file:
     path: "{{ php_source_install_path }}"
     state: directory
     mode: 0755
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Build configure script.
   shell: >
     ./buildconf --force
     chdir={{ php_source_clone_dir }}
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Run configure script.
   shell: >
     {{ php_source_configure_command }}
     chdir={{ php_source_clone_dir }}
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Make and install PHP.
   shell: >
@@ -111,7 +111,7 @@
   with_items:
     - "{{ php_source_make_command }}"
     - make install
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Ensure php executable is symlinked into a standard path.
   file:

provisioning/roles/geerlingguy.php/tests/test-source.yml

@@ -5,10 +5,8 @@
     php_enable_webserver: false
     php_install_from_source: true
     php_source_clone_dir: /root/php-src
-    # Workaround for https://github.com/ansible/ansible-modules-core/issues/5457
-    php_source_clone_depth: 0
     php_source_make_command: "make --jobs=2"
-    php_source_version: "php-7.0.13"
+    php_source_version: "php-7.1.9"
     php_memory_limit: "192M"
 
   pre_tasks:

provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml

@@ -15,16 +15,9 @@
       changed_when: false
 
     # Ubuntu-specific tasks.
-    - include_vars: test-vars-ubuntu1204.yml
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
-
     - name: Add repository for PHP 7.
       apt_repository: repo='ppa:ondrej/php'
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '12.04'
-
-    - name: Add repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php'
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
+      when: ansible_distribution == 'Ubuntu'
 
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).