From 1bd626244490ce383b107a29076e7a4423a38480 Mon Sep 17 00:00:00 2001
From: Greg Harvey <greg.harvey@gmail.com>
Date: Tue, 4 Feb 2025 16:50:57 +0100
Subject: [PATCH 1/2] Adding composer validate feature.

---
 roles/composer/defaults/main.yml |  3 ++-
 roles/composer/tasks/main.yml    | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/roles/composer/defaults/main.yml b/roles/composer/defaults/main.yml
index 314f8bd0..26f6d911 100644
--- a/roles/composer/defaults/main.yml
+++ b/roles/composer/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 composer:
-  command: install
+  validate_command: "validate --no-check-all --no-check-publish" # leave empty to skip validation
+  command: install # leave empty to do nothing
   no_dev: true
   working_dir: "{{ deploy_path }}"
   apcu_autoloader: true
diff --git a/roles/composer/tasks/main.yml b/roles/composer/tasks/main.yml
index 5bf70693..425b323f 100644
--- a/roles/composer/tasks/main.yml
+++ b/roles/composer/tasks/main.yml
@@ -1,6 +1,16 @@
 ---
+- name: Validate composer.json and composer.lock files.
+  community.general.composer:
+    command: "{{ composer.validate_command }}"
+    no_dev: "{{ composer.no_dev }}"
+    working_dir: "{{ composer.working_dir }}"
+    apcu_autoloader: "{{ composer.apcu_autoloader }}"
+  when:
+    - deploy_operation == 'deploy'
+    - composer.validate_command | length > 1
+
 - name: Perform composer step.
-  composer:
+  community.general.composer:
     command: "{{ composer.command }}"
     no_dev: "{{ composer.no_dev }}"
     working_dir: "{{ composer.working_dir }}"
@@ -10,7 +20,7 @@
     - composer.command | length > 1
 
 - name: Generate additional templates.
-  template:
+  ansible.builtin.template:
     src: "{{ template.src }}"
     dest: "{{ deploy_path }}/{{ template.dest }}"
   with_items: "{{ composer.templates }}"
@@ -21,7 +31,7 @@
     - deploy_operation == 'deploy'
 
 - name: Create additional symlinks.
-  file:
+  ansible.builtin.file:
     src: "{{ link.src }}"
     dest: "{{ deploy_path }}/{{ link.dest }}"
     state: link

From 7ca7012a470cf57d69e0e43109a7eec1d1b8bfea Mon Sep 17 00:00:00 2001
From: Greg Harvey <greg.harvey@gmail.com>
Date: Tue, 4 Feb 2025 17:18:51 +0100
Subject: [PATCH 2/2] Moving composer arguments to proper place.

---
 roles/composer/defaults/main.yml | 3 ++-
 roles/composer/tasks/main.yml    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/composer/defaults/main.yml b/roles/composer/defaults/main.yml
index 26f6d911..6f343c08 100644
--- a/roles/composer/defaults/main.yml
+++ b/roles/composer/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 composer:
-  validate_command: "validate --no-check-all --no-check-publish" # leave empty to skip validation
+  validate_command: validate # leave empty to skip validation
+  validate_args: "--no-check-all --no-check-publish"
   command: install # leave empty to do nothing
   no_dev: true
   working_dir: "{{ deploy_path }}"
diff --git a/roles/composer/tasks/main.yml b/roles/composer/tasks/main.yml
index 425b323f..94af3657 100644
--- a/roles/composer/tasks/main.yml
+++ b/roles/composer/tasks/main.yml
@@ -2,6 +2,7 @@
 - name: Validate composer.json and composer.lock files.
   community.general.composer:
     command: "{{ composer.validate_command }}"
+    arguments: "{{ composer.validate_args }}"
     no_dev: "{{ composer.no_dev }}"
     working_dir: "{{ composer.working_dir }}"
     apcu_autoloader: "{{ composer.apcu_autoloader }}"