Use FQCN builtins

tests/includes/Debian/sury.yml

@@ -1,9 +1,9 @@
 ---
 
 - name: APT | Install Sury key
-  apt_key:
+  ansible.builtin.apt_key:
     url: 'https://packages.sury.org/php/apt.gpg'
 
 - name: APT_REPOSITORY | Add Sury repository
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: 'deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main'

tests/includes/pre_Debian.yml

@@ -1,11 +1,11 @@
 ---
 
 - name: SET_FACT | Prepare test vars
-  set_fact:
+  ansible.builtin.set_fact:
     __nginx_conf: /etc/nginx/nginx.conf
 
 - name: APT | Install packages
-  apt:
+  ansible.builtin.apt:
     pkg: "{{ p }}"
     update_cache: true
     cache_valid_time: 3600
@@ -20,5 +20,5 @@
       - vim
 
 - name: INCLUDE_TASKS | Sury
-  include_tasks: Debian/sury.yml
+  ansible.builtin.include_tasks: Debian/sury.yml
   when: php_version != php_default_version

tests/includes/pre_FreeBSD.yml

@@ -1,10 +1,10 @@
 ---
 
 - name: SET_FACT | Prepare test vars
-  set_fact:
+  ansible.builtin.set_fact:
     __nginx_conf: /usr/local/etc/nginx/nginx.conf
     php_xdebug_package: 'php72-pecl-xdebug-2.6.1'
 
 - name: PKGNG | Install packages
-  pkgng:
+  ansible.builtin.pkgng:
     name: ['curl', 'nginx']

tests/test.yml

@@ -32,10 +32,10 @@
   pre_tasks:
 
     - name: INCLUDE_TASKS | Pre tasks related to OS
-      include_tasks: "includes/pre_{{ ansible_os_family }}.yml"
+      ansible.builtin.include_tasks: "includes/pre_{{ ansible_os_family }}.yml"
 
     - name: USER | Create PHP user
-      user:
+      ansible.builtin.user:
         name: 'foo'
         system: true
         create_home: false
@@ -44,26 +44,29 @@
   tasks:
 
     - name: TEMPLATE | Nginx site config
-      template:
+      ansible.builtin.template:
         src: "templates/nginx.conf.j2"
         dest: "{{ __nginx_conf  }}"
+        mode: 0644
+        owner: root
+        group: root
       notify: reload nginx
 
     - name: COMMAND | Fix nginx config
-      command: "cp {{ __nginx_conf | dirname }}/fastcgi_params {{ __nginx_conf | dirname }}/fastcgi.conf"
+      ansible.builtin.command: "cp {{ __nginx_conf | dirname }}/fastcgi_params {{ __nginx_conf | dirname }}/fastcgi.conf"
       args:
         creates: "{{ __nginx_conf | dirname }}/fastcgi.conf"
       notify: reload nginx
 
     - name: LINEINFILE | Fix nginx config (second step)
-      lineinfile:
+      ansible.builtin.lineinfile:
         regexp: '^fastcgi_param\s+SCRIPT_FILENAME'
         line: "fastcgi_param  SCRIPT_FILENAME    $realpath_root$fastcgi_script_name;"
         dest: "{{ __nginx_conf | dirname }}/fastcgi.conf"
       notify: reload nginx
 
     - name: SERVICE | Ensure nginx is started
-      service:
+      ansible.builtin.service:
         name: nginx
         state: started
       when: ansible_virtualization_type != 'docker'
@@ -71,7 +74,7 @@
     - block:
 
         - name: COMMAND | Docker nginx status
-          command: service nginx status
+          ansible.builtin.command: service nginx status
           args:
             warn: false
           changed_when: false
@@ -79,7 +82,7 @@
           register: ngs
 
         - name: COMMAND | Docker start nginx
-          command: service nginx start
+          ansible.builtin.command: service nginx start
           args:
             warn: false
           when: ngs.stdout.find('nginx is not running') != -1
@@ -89,13 +92,13 @@
   handlers:
 
     - name: reload nginx
-      service:
+      ansible.builtin.service:
         name: nginx
         state: reloaded
       notify: docker reload nginx
 
     - name: docker reload nginx
-      command: service nginx reload
+      ansible.builtin.command: service nginx reload
       args:
         warn: false
       notify: docker reload nginx
@@ -107,36 +110,48 @@
   post_tasks:
 
     - name: SHELL | Test php-cli
-      shell: php -i | grep '^PHP Version => {{ php_version }}' | head -n 1
+      ansible.builtin.shell: set -o pipefail && php -i | grep '^PHP Version => {{ php_version }}' | head -n 1
       changed_when: false
       register: p
       failed_when: p.stdout == ''
+      args:
+        executable: /bin/bash
 
     - name: FILE | Create /var/www
-      file:
+      ansible.builtin.file:
         dest: /var/www
         state: directory
+        owner: root
+        group: root
+        mode: 0755
 
     - name: COPY | Add phpinfo
-      copy:
+      ansible.builtin.copy:
         dest: /var/www/phpinfo.php
         content: '<?php phpinfo();'
+        owner: root
+        group: root
+        mode: 0644
 
     - name: COPY | Add ini test file
-      copy:
+      ansible.builtin.copy:
         dest: /var/www/ini.php
         content: '<?php echo ini_get("memory_limit") . "\n";'
+        owner: root
+        group: root
+        mode: 0644
 
     - name: SHELL | Check vhost
-      shell: "curl -v -H 'Host: {{ vhost }}' http://127.0.0.1/phpinfo.php 2> /dev/null | grep h1 | grep -o 'PHP Version {{ php_version }}' | sed -r 's/<//g'"
+      ansible.builtin.shell: "set -o pipefail && curl -v -H 'Host: {{ vhost }}' http://127.0.0.1/phpinfo.php 2> /dev/null | grep h1 | grep -o 'PHP Version {{ php_version }}' | sed -r 's/<//g'"
       args:
         warn: false
+        executable: /bin/bash
       changed_when: false
       register: c
       failed_when: c.stdout == ''
 
     - name: SHELL | Check custom php value
-      shell: "curl -H 'Host: {{ vhost }}' http://127.0.0.1/ini.php 2> /dev/null"
+      ansible.builtin.shell: "curl -H 'Host: {{ vhost }}' http://127.0.0.1/ini.php 2> /dev/null"
       args:
         warn: false
       changed_when: false
@@ -144,11 +159,11 @@
       failed_when: 'php_fpm_poold.1.php_admin_value.memory_limit not in c.stdout'
 
     - name: URI | Check ping
-      uri:
+      ansible.builtin.uri:
         url: "http://localhost{{ php_fpm_poold.0.ping_path }}"
       when: php_fpm_poold.0.ping_path is defined
 
     - name: URI | Check status
-      uri:
+      ansible.builtin.uri:
         url: "http://localhost{{ php_fpm_poold.0.status_path }}"
       when: php_fpm_poold.0.status_path is defined