From 597769e968a1bbb0668ee18ddfb4d9454664b95d Mon Sep 17 00:00:00 2001
From: Dale Grant <dale@codeand.com.au>
Date: Tue, 23 Apr 2024 16:52:21 +1000
Subject: [PATCH] Update comments to use current default php version, remove
 8.3.yml file.

---
 roles/common/tasks/main.yml                  |  2 +-
 roles/php/vars/8.3.yml                       | 18 ------------------
 roles/php/vars/version-specific-defaults.yml |  4 ++--
 roles/xdebug/tasks/main.yml                  |  2 +-
 4 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 roles/php/vars/8.3.yml

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 763d86fdbb..7eb23cbc21 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -41,7 +41,7 @@
   vars:
     params:
       files:
-        - '{{ php_version }}.yml' # e.g. 8.1.yml
+        - '{{ php_version }}.yml' # e.g. 8.2.yml
         - version-specific-defaults.yml
       paths:
         - "{{ playbook_dir }}/roles/php/vars/"
diff --git a/roles/php/vars/8.3.yml b/roles/php/vars/8.3.yml
deleted file mode 100644
index 557f9726a5..0000000000
--- a/roles/php/vars/8.3.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-php_extensions_default:
-  php8.3-bcmath: "{{ apt_package_state }}"
-  php8.3-cli: "{{ apt_package_state }}"
-  php8.3-curl: "{{ apt_package_state }}"
-  php8.3-dev: "{{ apt_package_state }}"
-  php8.3-fpm: "{{ apt_package_state }}"
-  php8.3-imagick: "{{ apt_package_state }}"
-  php8.3-intl: "{{ apt_package_state }}"
-  php8.3-mbstring: "{{ apt_package_state }}"
-  php8.3-mysql: "{{ apt_package_state }}"
-  php8.3-xml: "{{ apt_package_state }}"
-  php8.3-xmlrpc: "{{ apt_package_state }}"
-  php8.3-zip: "{{ apt_package_state }}"
-
-php_memcached_packages:
-  php8.3-memcached: "{{ apt_package_state }}"
-
-php_xdebug_package: php8.3-xdebug
diff --git a/roles/php/vars/version-specific-defaults.yml b/roles/php/vars/version-specific-defaults.yml
index 23a3e24480..b3bc73a075 100644
--- a/roles/php/vars/version-specific-defaults.yml
+++ b/roles/php/vars/version-specific-defaults.yml
@@ -3,11 +3,11 @@
 #
 # To override these defaults for a specific php version, duplicate this
 # file to roles/php/vars/ and rename with your specific php version
-# e.g. roles/php/vars/8.1.yml.
+# e.g. roles/php/vars/8.2.yml.
 #
 # You can then use e.g.
 # php_extensions_default:
-#   php8.1-bcmath: "{{ apt_package_state }}"
+#   php8.2-bcmath: "{{ apt_package_state }}"
 #
 php_extensions_default:
   "php{{ php_version }}-bcmath": "{{ apt_package_state }}"
diff --git a/roles/xdebug/tasks/main.yml b/roles/xdebug/tasks/main.yml
index 6173e7fe5b..f4d1d3acef 100644
--- a/roles/xdebug/tasks/main.yml
+++ b/roles/xdebug/tasks/main.yml
@@ -4,7 +4,7 @@
   vars:
     params:
       files:
-        - '{{ php_version }}.yml' # e.g. 8.1.yml
+        - '{{ php_version }}.yml' # e.g. 8.2.yml
         - version-specific-defaults.yml
       paths:
         - "{{ playbook_dir }}/roles/php/vars/"