From b217f54d7aabd01a1ac4f4881be4989f7e7135a5 Mon Sep 17 00:00:00 2001
From: DanielFloris <daniel@klika.com.au>
Date: Mon, 31 Oct 2022 15:57:53 +1100
Subject: [PATCH] Adding pcov for php 8.x to php-fpm and workspace

---
 php-fpm/Dockerfile   |  8 +++-----
 workspace/Dockerfile | 10 ++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index bed1b4c0..c3f9b120 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -260,11 +260,9 @@ USER root
 ARG INSTALL_PCOV=false
 
 RUN if [ ${INSTALL_PCOV} = true ]; then \
-  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
-    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
-      pecl install pcov && \
-      docker-php-ext-enable pcov \
-    ;fi \
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]  || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; }; then \
+    pecl install pcov && \
+    docker-php-ext-enable pcov \
   ;fi \
 ;fi
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index fda1e7d4..305a2a3b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -376,12 +376,10 @@ USER root
 ARG INSTALL_PCOV=false
 
 RUN if [ ${INSTALL_PCOV} = true ]; then \
-  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
-    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
-      pecl install pcov && \
-      echo "extension=pcov.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini && \
-      echo "pcov.enabled" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
-    ;fi \
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]  || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; }; then \
+    pecl install pcov && \
+    echo "extension=pcov.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini && \
+    echo "pcov.enabled" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
   ;fi \
 ;fi