From bba8ae739a7e8d11701924f25feabc9889f195c6 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Wed, 23 Aug 2023 13:58:12 +0200
Subject: [PATCH 1/2] WIP

---
 .ansible-lint            | 2 +-
 .github/workflows/ci.yml | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index 142c0e2..b04781e 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,5 +1,5 @@
 ---
 warn_list:
   - role-name
+  - name[play]
   - name[casing]
-  - '204'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 292e437..7e2bc34 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,9 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install ansible-lint[community,yamllint]
+        run: |
+          pip install ansible-lint
+          ansible-galaxy install -r requirements.yml
 
       - name: Lint code
         run: |
@@ -43,11 +45,8 @@ jobs:
       matrix:
         include:
           - distro: debian8
-            ansible-version: '<2.10'
           - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604
@@ -66,7 +65,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
+        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
 
       - name: Run Molecule tests
         run: |

From c2b42ea86a3524f9240bf7507c957529ae31bb38 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Wed, 23 Aug 2023 13:59:18 +0200
Subject: [PATCH 2/2] WIP

---
 tasks/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 1485e92..9e75751 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: create (download) directory
-  file:
+  ansible.builtin.file:
     path: "{{ phpstorm_downloads_path }}"
     state: directory
     owner: root
@@ -13,7 +13,7 @@
     - phpstorm-download
 
 - name: download
-  get_url:
+  ansible.builtin.get_url:
     url: "http://download-cf.jetbrains.com/webide/PhpStorm-{{ phpstorm_version }}.tar.gz"
     dest: "{{ phpstorm_downloads_path }}/PhpStorm-{{ phpstorm_version }}.tar.gz"
     owner: root
@@ -25,7 +25,7 @@
     - phpstorm-downloads
 
 - name: install
-  unarchive:
+  ansible.builtin.unarchive:
     src: "{{ phpstorm_downloads_path }}/PhpStorm-{{ phpstorm_version }}.tar.gz"
     dest: "{{ phpstorm_install_prefix }}"
     creates: "{{ phpstorm_install_prefix }}/phpstorm-{{ phpstorm_version }}"