From f39157ac79196a33cdd6f5a179170a46c1a2b351 Mon Sep 17 00:00:00 2001
From: Xstar97 <Xstar97@users.noreply.github.com>
Date: Mon, 2 Jan 2023 03:37:44 -0500
Subject: [PATCH] fix(wordpress) update php-config variable (#5945)

* fix(wordpress) update php-config variable

* change php-config to php

* fix config

* fix confmap

Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/stable/wordpress/Chart.yaml         |  2 +-
 charts/stable/wordpress/templates/_env.tpl | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/charts/stable/wordpress/Chart.yaml b/charts/stable/wordpress/Chart.yaml
index 480759ca59d..30ecd769b36 100644
--- a/charts/stable/wordpress/Chart.yaml
+++ b/charts/stable/wordpress/Chart.yaml
@@ -24,7 +24,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/wordpress
   - https://hub.docker.com/_/wordpress
   - https://www.wordpress.org
-version: 1.0.11
+version: 1.1.0
 annotations:
   truecharts.org/catagories: |
     - website
diff --git a/charts/stable/wordpress/templates/_env.tpl b/charts/stable/wordpress/templates/_env.tpl
index f6f26fac042..43f1b8c5088 100644
--- a/charts/stable/wordpress/templates/_env.tpl
+++ b/charts/stable/wordpress/templates/_env.tpl
@@ -30,29 +30,30 @@ data:
   WORDPRESS_SMTP_PORT: {{ .Values.smtp.port | quote }}
   {{- end }}
 
+  {{- $php := get .Values "php-config" }}
   {{/* PHP */}}
-  {{- with .Values.wordpress.PHP_ENABLE_OPCACHE }}
+  {{- with $php.PHP_ENABLE_OPCACHE }}
   PHP_ENABLE_OPCACHE: {{ . | quote }}
   {{- end }}
-  {{- with .Values.wordpress.PHP_EXPOSE_PHP }}
+  {{- with $php.PHP_EXPOSE_PHP }}
   PHP_EXPOSE_PHP: {{ . | quote }}
   {{- end }}
-  {{- with .Values.wordpress.PHP_MAX_EXECUTION_TIME }}
+  {{- with $php.PHP_MAX_EXECUTION_TIME }}
   PHP_MAX_EXECUTION_TIME: {{ . | quote }}
   {{- end }}
-  {{- with .Values.wordpress.PHP_MAX_INPUT_TIME }}
+  {{- with $php.PHP_MAX_INPUT_TIME }}
   PHP_MAX_INPUT_TIME: {{ . | quote }}
   {{- end }}
-  {{- with .Values.wordpress.PHP_MAX_INPUT_VARS }}
+  {{- with $php.PHP_MAX_INPUT_VARS }}
   PHP_MAX_INPUT_VARS: {{ . | quote }}
   {{- end }}
-  {{- with .Values.wordpress.PHP_MEMORY_LIMIT }}
+  {{- with $php.PHP_MEMORY_LIMIT }}
   PHP_MEMORY_LIMIT: {{ . | quote }}
   {{- end }}
-  {{- with .Values.wordpress.PHP_POST_MAX_SIZE }}
+  {{- with $php.PHP_POST_MAX_SIZE }}
   PHP_POST_MAX_SIZE: {{ . | quote }}
   {{- end }}
-  {{- with .Values.wordpress.PHP_UPLOAD_MAX_FILESIZE }}
+  {{- with $php.PHP_UPLOAD_MAX_FILESIZE }}
   PHP_UPLOAD_MAX_FILESIZE: {{ . | quote }}
   {{- end }}
 ---